generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extended performance test

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-02-14 18:55:11 +04:00
parent 8150c1b7e4
commit c8e22c04c8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/imgproc/perf/opencl/perf_color.cpp
View File

@ -58,7 +58,8 @@ using std::tr1::make_tuple;
CV_ENUM(ConversionTypes, COLOR_RGB2GRAY, COLOR_RGB2BGR, COLOR_RGB2YUV, COLOR_YUV2RGB, COLOR_RGB2YCrCb, CV_ENUM(ConversionTypes, COLOR_RGB2GRAY, COLOR_RGB2BGR, COLOR_RGB2YUV, COLOR_YUV2RGB, COLOR_RGB2YCrCb,
COLOR_YCrCb2RGB, COLOR_RGB2XYZ, COLOR_XYZ2RGB, COLOR_RGB2HSV, COLOR_HSV2RGB, COLOR_RGB2HLS, COLOR_YCrCb2RGB, COLOR_RGB2XYZ, COLOR_XYZ2RGB, COLOR_RGB2HSV, COLOR_HSV2RGB, COLOR_RGB2HLS,
COLOR_HLS2RGB, COLOR_BGR5652BGR, COLOR_BGR2BGR565, COLOR_RGBA2mRGBA, COLOR_mRGBA2RGBA, COLOR_YUV2RGB_NV12) COLOR_HLS2RGB, COLOR_BGR5652BGR, COLOR_BGR2BGR565, COLOR_RGBA2mRGBA, COLOR_mRGBA2RGBA, COLOR_YUV2RGB_NV12,
COLOR_RGB2Lab, COLOR_Lab2BGR)
typedef tuple<Size, tuple<ConversionTypes, int, int> > CvtColorParams; typedef tuple<Size, tuple<ConversionTypes, int, int> > CvtColorParams;
typedef TestBaseWithParam<CvtColorParams> CvtColorFixture; typedef TestBaseWithParam<CvtColorParams> CvtColorFixture;
@ -82,7 +83,9 @@ OCL_PERF_TEST_P(CvtColorFixture, CvtColor, testing::Combine(
make_tuple(ConversionTypes(COLOR_BGR2BGR565), 3, 2), make_tuple(ConversionTypes(COLOR_BGR2BGR565), 3, 2),
make_tuple(ConversionTypes(COLOR_RGBA2mRGBA), 4, 4), make_tuple(ConversionTypes(COLOR_RGBA2mRGBA), 4, 4),
make_tuple(ConversionTypes(COLOR_mRGBA2RGBA), 4, 4), make_tuple(ConversionTypes(COLOR_mRGBA2RGBA), 4, 4),
make_tuple(ConversionTypes(COLOR_YUV2RGB_NV12), 1, 3) make_tuple(ConversionTypes(COLOR_YUV2RGB_NV12), 1, 3),
make_tuple(ConversionTypes(COLOR_RGB2Lab), 3, 3),
make_tuple(ConversionTypes(COLOR_Lab2BGR), 3, 4)
))) )))
{ {
CvtColorParams params = GetParam(); CvtColorParams params = GetParam();

2
modules/imgproc/src/color.cpp
View File

@ -3158,7 +3158,7 @@ static bool ocl_cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
coeffs[i+bidx*3] = _coeffs[i+6]*_whitept[i]; coeffs[i+bidx*3] = _coeffs[i+6]*_whitept[i];
} }
Mat(1, 9, CV_32SC1, coeffs).copyTo(ucoeffs); Mat(1, 9, CV_32FC1, coeffs).copyTo(ucoeffs);
} }
_dst.create(sz, CV_MAKETYPE(depth, dcn)); _dst.create(sz, CV_MAKETYPE(depth, dcn));