p83571920
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!13575 Add check to RgbToGray 

From: @shenwei41
Reviewed-by: @tiancixiao,@liucunwei
Signed-off-by: @liucunwei
This commit is contained in:
mindspore-ci-bot 2021-03-22 12:11:39 +08:00 committed by Gitee
parent f2d2311ee8 8a1f283efc
commit 06892b83ff
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/image_process.cc
View File

@ -1680,9 +1680,18 @@ bool GetAffineTransform(std::vector<Point> src_point, std::vector<Point> dst_poi
bool ConvertRgbToGray(const LiteMat &src, LDataType data_type, int w, int h, LiteMat &mat) {
if (data_type == LDataType::UINT8) {
if (src.IsEmpty()) {
return false;
}
if (mat.IsEmpty()) {
mat.Init(w, h, 1, LDataType::UINT8);
}
if (mat.channel_ != 1) {
return false;
}
if ((src.width_ != w) || (src.height_ != h)) {
return false;
}
unsigned char *ptr = mat;
const unsigned char *data_ptr = src;
for (int y = 0; y < h; y++) {

33
tests/ut/cpp/dataset/image_process_test.cc
View File

@ -1798,6 +1798,39 @@ TEST_F(MindDataImageProcess, testConvertRgbToGray) {
CompareMat(rgb_mat, lite_mat_gray);
}
TEST_F(MindDataImageProcess, testConvertRgbToGrayFail) {
std::string filename = "data/dataset/apple.jpg";
cv::Mat image = cv::imread(filename, cv::ImreadModes::IMREAD_COLOR);
cv::Mat rgb_mat;
cv::Mat rgb_mat1;
cv::cvtColor(image, rgb_mat, CV_BGR2GRAY);
cv::imwrite("./opencv_image.jpg", rgb_mat);
cv::cvtColor(image, rgb_mat1, CV_BGR2RGB);
// The width and height of the output image is different from the original image.
LiteMat lite_mat_rgb;
lite_mat_rgb.Init(rgb_mat1.cols, rgb_mat1.rows, rgb_mat1.channels(), rgb_mat1.data, LDataType::UINT8);
LiteMat lite_mat_gray;
bool ret = ConvertRgbToGray(lite_mat_rgb, LDataType::UINT8, 1000, 1000, lite_mat_gray);
ASSERT_TRUE(ret == false);
// The input lite_mat_rgb object is null.
LiteMat lite_mat_rgb1;
LiteMat lite_mat_gray1;
bool ret1 = ConvertRgbToGray(lite_mat_rgb1, LDataType::UINT8, image.cols, image.rows, lite_mat_gray1);
ASSERT_TRUE(ret1 == false);
// The channel of output image object is not 1.
LiteMat lite_mat_rgb2;
lite_mat_rgb2.Init(rgb_mat1.cols, rgb_mat1.rows, rgb_mat1.channels(), rgb_mat1.data, LDataType::UINT8);
LiteMat lite_mat_gray2;
lite_mat_gray2.Init(rgb_mat1.cols, rgb_mat1.rows, rgb_mat1.channels(), rgb_mat1.data, LDataType::UINT8);
bool ret2 = ConvertRgbToGray(lite_mat_rgb2, LDataType::UINT8, image.cols, image.rows, lite_mat_gray2);
ASSERT_TRUE(ret2 == false);
}
TEST_F(MindDataImageProcess, testResizePreserveARWithFillerv) {
std::string filename = "data/dataset/apple.jpg";
cv::Mat image = cv::imread(filename, cv::ImreadModes::IMREAD_COLOR);