Skip to content

O
opencv
Commit 5795bb32 authored by Andrey Pavlenko's avatar Andrey Pavlenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #1723 from ilya-lavrenov:ocl_norm

parents ead37e4a 16df5b00
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
modules/ocl/perf/perf_matrix_operation.cpp
View file @ 5795bb32
...@@ -156,6 +156,8 @@ PERF_TEST_P(setToFixture, setTo, ...@@ -156,6 +156,8 @@ PERF_TEST_P(setToFixture, setTo,
OCL_PERF_ELSE OCL_PERF_ELSE
} }
#if 0
/////////////////// upload /////////////////////////// /////////////////// upload ///////////////////////////
typedef tuple<Size, MatDepth, int> uploadParams; typedef tuple<Size, MatDepth, int> uploadParams;
...@@ -228,3 +230,5 @@ PERF_TEST_P(downloadFixture, download, ...@@ -228,3 +230,5 @@ PERF_TEST_P(downloadFixture, download,
SANITY_CHECK_NOTHING(); SANITY_CHECK_NOTHING();
} }
#endif
modules/ocl/src/arithm.cpp
View file @ 5795bb32
...@@ -688,7 +688,7 @@ double cv::ocl::norm(const oclMat &src1, const oclMat &src2, int normType) ...@@ -688,7 +688,7 @@ double cv::ocl::norm(const oclMat &src1, const oclMat &src2, int normType)
break; break;
} }
if (isRelative) if (isRelative)
r = r / norm(src2, normType); r = r / (norm(src2, normType) + DBL_EPSILON);
return r; return r;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment