#1732 Added YUV422 conversions

4ee2c486 · Andrey Kamaev · 24f82c75 · 4ee2c486 · 4ee2c486 · 4ee2c486
Commit 4ee2c486 authored Apr 05, 2012 by Andrey Kamaev
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

color.cpp modules/imgproc/src/color.cpp +0 -0

test_color.cpp modules/imgproc/test/test_color.cpp +0 -2

test_cvtyuv.cpp modules/imgproc/test/test_cvtyuv.cpp +1 -4

No files found.
--- a/modules/imgproc/src/color.cpp
+++ b/modules/imgproc/src/color.cpp
--- a/modules/imgproc/test/test_color.cpp
+++ b/modules/imgproc/test/test_color.cpp
@@ -1688,8 +1688,6 @@ TEST(Imgproc_ColorBayer, regression)

    Mat diff;
    absdiff(gold, result, diff);
-    //imshow("diff", diff);
-    //waitKey();

    EXPECT_EQ(0, countNonZero(diff.reshape(1) > 1));
 }

--- a/modules/imgproc/test/test_cvtyuv.cpp
+++ b/modules/imgproc/test/test_cvtyuv.cpp
@@ -477,10 +477,7 @@ INSTANTIATE_TEST_CASE_P(cvt420, Imgproc_ColorYUV,
                      (int)CV_YUV2RGBA_YV12, (int)CV_YUV2BGRA_YV12, (int)CV_YUV2RGBA_IYUV, (int)CV_YUV2BGRA_IYUV,
                      (int)CV_YUV2GRAY_420));

-INSTANTIATE_TEST_CASE_P(DISABLED_cvt888, Imgproc_ColorYUV,
-    ::testing::Values((int)CV_YUV2BGR, (int)CV_YUV2RGB));
-
-INSTANTIATE_TEST_CASE_P(DISABLED_cvt422, Imgproc_ColorYUV,
+INSTANTIATE_TEST_CASE_P(cvt422, Imgproc_ColorYUV,
    ::testing::Values((int)CV_YUV2RGB_UYVY, (int)CV_YUV2BGR_UYVY, (int)CV_YUV2RGBA_UYVY, (int)CV_YUV2BGRA_UYVY,
                      (int)CV_YUV2RGB_YUY2, (int)CV_YUV2BGR_YUY2, (int)CV_YUV2RGB_YVYU, (int)CV_YUV2BGR_YVYU,
                      (int)CV_YUV2RGBA_YUY2, (int)CV_YUV2BGRA_YUY2, (int)CV_YUV2RGBA_YVYU, (int)CV_YUV2BGRA_YVYU,