fixed gpu::cvtColor

0d09352f · Vladislav Vinogradov · ada3e6e6 · 0d09352f · 0d09352f · 0d09352f
Commit 0d09352f authored Jun 15, 2011 by Vladislav Vinogradov
Showing with 9 additions and 9 deletions

color.cu modules/gpu/src/cuda/color.cu +0 -0

limits_gpu.hpp modules/gpu/src/opencv2/gpu/device/limits_gpu.hpp +0 -0

test_imgproc_gpu.cpp modules/gpu/test/test_imgproc_gpu.cpp +9 -9

No files found.
--- a/modules/gpu/src/cuda/color.cu
+++ b/modules/gpu/src/cuda/color.cu
--- a/modules/gpu/src/opencv2/gpu/device/limits_gpu.hpp
+++ b/modules/gpu/src/opencv2/gpu/device/limits_gpu.hpp
--- a/modules/gpu/test/test_imgproc_gpu.cpp
+++ b/modules/gpu/test/test_imgproc_gpu.cpp
@@ -461,17 +461,17 @@ protected:

 int CV_GpuCvtColorTest::CheckNorm(const Mat& m1, const Mat& m2)
 {
-    double ret = norm(m1, m2, NORM_INF);
+    float max_err = 1e-2f;
+
+    Mat diff;
+    cv::matchTemplate(m1, m2, diff, CV_TM_CCORR_NORMED);
+
+    float err = abs(diff.at<float>(0, 0) - 1.f);
+
+    if (err > max_err)
+        return cvtest::TS::FAIL_INVALID_OUTPUT;

-    if (ret <= 3)
-    {
    return cvtest::TS::OK;
-    }
-    else
-    {
-        ts->printf(cvtest::TS::LOG, "\nNorm: %f\n", ret);
-        return cvtest::TS::FAIL_GENERIC;
-    }
 }

 void CV_GpuCvtColorTest::run( int )