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

Merge pull request #3525 from jet47:fix-cudev-tests

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-12-22 10:57:06 +00:00
parent 7b20ce4952 ec33c4ae36
commit a1df295079
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp
View File

@@ -797,8 +797,7 @@ namespace color_cvt_detail
if (diff > numeric_limits<float>::epsilon()) if (diff > numeric_limits<float>::epsilon())
{ {
s = (l < 0.5f) * diff / (vmax + vmin); s = l < 0.5f ? diff / (vmax + vmin) : diff / (2 - vmax - vmin);
s += (l >= 0.5f) * diff / (2.0f - vmax - vmin);
diff = 60.f / diff; diff = 60.f / diff;
@@ -1190,7 +1189,7 @@ namespace color_cvt_detail
dst.x = saturate_cast<uchar>(buf.x * 2.55f); dst.x = saturate_cast<uchar>(buf.x * 2.55f);
dst.y = saturate_cast<uchar>(buf.y * 0.72033898305084743f + 96.525423728813564f); dst.y = saturate_cast<uchar>(buf.y * 0.72033898305084743f + 96.525423728813564f);
dst.z = saturate_cast<uchar>(buf.z * 0.99609375f + 139.453125f); dst.z = saturate_cast<uchar>(buf.z * 0.9732824427480916f + 136.259541984732824f);
return dst; return dst;
} }
@@ -1255,7 +1254,7 @@ namespace color_cvt_detail
buf.x = src.x * (100.f / 255.f); buf.x = src.x * (100.f / 255.f);
buf.y = src.y * 1.388235294117647f - 134.f; buf.y = src.y * 1.388235294117647f - 134.f;
buf.z = src.z * 1.003921568627451f - 140.f; buf.z = src.z * 1.027450980392157f - 140.f;
Luv2RGB<float, 3, 3, srgb, blueIdx> cvtf; Luv2RGB<float, 3, 3, srgb, blueIdx> cvtf;
buf = cvtf(buf); buf = cvtf(buf);

4
modules/cudev/test/test_arithm_func.cu
View File

@@ -69,7 +69,7 @@ public:
Mat dst_gold; Mat dst_gold;
cv::sqrt(src, dst_gold); cv::sqrt(src, dst_gold);
EXPECT_MAT_NEAR(dst_gold, dst, 0.0); EXPECT_MAT_NEAR(dst_gold, dst, 1e-4);
} }
void test_expr() void test_expr()
@@ -88,7 +88,7 @@ public:
cv::multiply(src1, src2, dst_gold); cv::multiply(src1, src2, dst_gold);
cv::sqrt(dst_gold, dst_gold); cv::sqrt(dst_gold, dst_gold);
EXPECT_MAT_NEAR(dst_gold, dst, 0.0); EXPECT_MAT_NEAR(dst_gold, dst, 1e-4);
} }
}; };

4
modules/cudev/test/test_color_cvt.cu
View File

@@ -69,7 +69,7 @@ enum {
GpuMat_<SelectIf<dst_cn == 1, uchar, uchar ## dst_cn>::type> dstb = src_space ## _to_ ## dst_space ## _(d_srcb); \ GpuMat_<SelectIf<dst_cn == 1, uchar, uchar ## dst_cn>::type> dstb = src_space ## _to_ ## dst_space ## _(d_srcb); \
Mat dstb_gold; \ Mat dstb_gold; \
cv::cvtColor(srcb, dstb_gold, COLOR_ ## src_space ## 2 ## dst_space); \ cv::cvtColor(srcb, dstb_gold, COLOR_ ## src_space ## 2 ## dst_space); \
EXPECT_MAT_NEAR(dstb_gold, dstb, 1.0); \ EXPECT_MAT_NEAR(dstb_gold, dstb, 2.0); \
Mat bgrf = randomMat(size, CV_32FC3, 0, 1); \ Mat bgrf = randomMat(size, CV_32FC3, 0, 1); \
Mat srcf; \ Mat srcf; \
cv::cvtColor(bgrf, srcf, COLOR_BGR ## 2 ## src_space, src_cn); \ cv::cvtColor(bgrf, srcf, COLOR_BGR ## 2 ## src_space, src_cn); \
@@ -77,7 +77,7 @@ enum {
GpuMat_<SelectIf<dst_cn == 1, float, float ## dst_cn>::type> dstf = src_space ## _to_ ## dst_space ## _(d_srcf); \ GpuMat_<SelectIf<dst_cn == 1, float, float ## dst_cn>::type> dstf = src_space ## _to_ ## dst_space ## _(d_srcf); \
Mat dstf_gold; \ Mat dstf_gold; \
cv::cvtColor(srcf, dstf_gold, COLOR_ ## src_space ## 2 ## dst_space); \ cv::cvtColor(srcf, dstf_gold, COLOR_ ## src_space ## 2 ## dst_space); \
EXPECT_MAT_NEAR(dstf_gold, dstf, 1.0); \ EXPECT_MAT_NEAR(dstf_gold, dstf, 2.0); \
} }
// RGB <-> BGR // RGB <-> BGR