Merge pull request #1723 from ilya-lavrenov:ocl_norm

5795bb32 · Andrey Pavlenko · OpenCV Buildbot · ead37e4a · 16df5b00 · 5795bb32
Commit 5795bb32 authored Oct 30, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Oct 30, 2013
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

perf_matrix_operation.cpp modules/ocl/perf/perf_matrix_operation.cpp +4 -0

arithm.cpp modules/ocl/src/arithm.cpp +1 -1

No files found.
--- a/modules/ocl/perf/perf_matrix_operation.cpp
+++ b/modules/ocl/perf/perf_matrix_operation.cpp
@@ -156,6 +156,8 @@ PERF_TEST_P(setToFixture, setTo,
        OCL_PERF_ELSE
 }

+#if 0
+
 /////////////////// upload ///////////////////////////

 typedef tuple<Size, MatDepth, int> uploadParams;
@@ -228,3 +230,5 @@ PERF_TEST_P(downloadFixture, download,

    SANITY_CHECK_NOTHING();
 }
+
+#endif
--- a/modules/ocl/src/arithm.cpp
+++ b/modules/ocl/src/arithm.cpp
@@ -688,7 +688,7 @@ double cv::ocl::norm(const oclMat &src1, const oclMat &src2, int normType)
        break;
    }
    if (isRelative)
-        r = r / norm(src2, normType);
+        r = r / (norm(src2, normType) + DBL_EPSILON);

    return r;
 }