mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 03:30:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2020-07-17 17:00:54 +00:00
commit a199d7adf1
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgproc/src/color_yuv.dispatch.cpp
View File

@ -406,6 +406,8 @@ void cvtColorTwoPlaneYUV2BGRpair( InputArray _ysrc, InputArray _uvsrc, OutputArr
Mat ysrc = _ysrc.getMat(), uvsrc = _uvsrc.getMat();
CV_CheckEQ(ysrc.step, uvsrc.step, "");
_dst.create( ysz, CV_MAKETYPE(depth, dcn));
Mat dst = _dst.getMat();

17
modules/imgproc/test/test_color.cpp
View File

@ -3072,4 +3072,21 @@ TEST(ImgProc_RGB2YUV, regression_13668)
EXPECT_EQ(res, ref);
}
TEST(ImgProc_cvtColorTwoPlane, missing_check_17036) // test can be removed if required feature is implemented
{
std::vector<uchar> y_data(700 * 480);
std::vector<uchar> uv_data(640 * 240);
Mat y_plane_padding(480, 640, CV_8UC1, y_data.data(), 700); // with stride
Mat uv_plane(240, 320, CV_8UC2, uv_data.data());
Mat result;
EXPECT_THROW(
cvtColorTwoPlane(y_plane_padding, uv_plane, result, COLOR_YUV2RGB_NV21);
, cv::Exception
);
}
}} // namespace