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

fixed the PR 1582

Browse Source
This commit is contained in:
Ilya Lavrenov 2013-10-09 14:07:24 +04:00
parent 6b69a66c3c
commit 488e6aafaf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ocl/src/opencl/arithm_add_scalar.cl
View File

@ -70,7 +70,7 @@
#if defined (FUNC_ABS) #if defined (FUNC_ABS)
#define EXPRESSION \ #define EXPRESSION \
T value = (src1[src1_index] > 0) ? src1[src1_index] : -src1[src1_index]; \ T value = src1[src1_index] > (T)(0) ? src1[src1_index] : -src1[src1_index]; \
dst[dst_index] = value; dst[dst_index] = value;
#endif #endif

6
modules/ocl/test/test_arithm.cpp
View File

@ -462,7 +462,7 @@ TEST_P(Min, Mat)
random_roi(); random_roi();
dst1_roi = cv::min(src1_roi, src2_roi); dst1_roi = cv::min(src1_roi, src2_roi);
cv::ocl::min(gsrc1, gsrc2, gdst1); cv::ocl::min(gsrc1_roi, gsrc2_roi, gdst1_roi);
Near(0); Near(0);
} }
} }
@ -476,7 +476,7 @@ TEST_P(Max, Mat)
random_roi(); random_roi();
dst1_roi = cv::min(src1_roi, src2_roi); dst1_roi = cv::min(src1_roi, src2_roi);
cv::ocl::min(gsrc1, gsrc2, gdst1); cv::ocl::min(gsrc1_roi, gsrc2_roi, gdst1_roi);
Near(0); Near(0);
} }
} }
@ -492,7 +492,7 @@ TEST_P(Abs, Abs)
random_roi(); random_roi();
dst1_roi = cv::abs(src1_roi); dst1_roi = cv::abs(src1_roi);
cv::ocl::abs(gsrc1, gdst1); cv::ocl::abs(gsrc1_roi, gdst1_roi);
Near(0); Near(0);
} }
} }