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

Merge pull request #1723 from ilya-lavrenov:ocl_norm

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-10-31 00:21:28 +04:00 committed by OpenCV Buildbot
commit 5795bb326d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ocl/perf/perf_matrix_operation.cpp
View File

@ -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,
SANITY_CHECK_NOTHING(); SANITY_CHECK_NOTHING();
} }
#endif

2
modules/ocl/src/arithm.cpp
View File

@ -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;
} }