color.cpp refactoring: created generic interface for toRGB and fromRGB callers

This commit is contained in:
Ilya Lavrenov
2013-11-09 19:14:38 +04:00
parent a57030a0cd
commit 33ae64201c
3 changed files with 32 additions and 139 deletions

View File

@@ -116,6 +116,8 @@ PARAM_TEST_CASE(CvtColor, MatDepth, bool)
#define CVTCODE(name) cv::COLOR_ ## name
// RGB <-> Gray
OCL_TEST_P(CvtColor, RGB2GRAY)
{
doTest(3, 1, CVTCODE(RGB2GRAY));
@@ -152,6 +154,7 @@ OCL_TEST_P(CvtColor, GRAY2BGRA)
doTest(1, 4, CVTCODE(GRAY2BGRA));
}
// RGB <-> YUV
OCL_TEST_P(CvtColor, RGB2YUV)
{
@@ -186,6 +189,7 @@ OCL_TEST_P(CvtColor, YUV2BGRA)
doTest(3, 4, CVTCODE(YUV2BGR));
}
// RGB <-> YCrCb
OCL_TEST_P(CvtColor, RGB2YCrCb)
{
@@ -220,6 +224,8 @@ OCL_TEST_P(CvtColor, YCrCb2BGRA)
doTest(3, 4, CVTCODE(YCrCb2BGR));
}
// YUV -> RGBA_NV12
struct CvtColor_YUV420 :
public CvtColor
{
@@ -262,7 +268,6 @@ OCL_TEST_P(CvtColor_YUV420, YUV2BGR_NV12)
doTest(1, 3, CV_YUV2BGR_NV12);
}
INSTANTIATE_TEST_CASE_P(OCL_ImgProc, CvtColor,
testing::Combine(
testing::Values(MatDepth(CV_8U), MatDepth(CV_16U), MatDepth(CV_32F)),