projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8899ec1
)
Fix IPP version ifdef
author
vbystricky
<user@user-pc.(none)>
Mon, 7 Apr 2014 13:38:43 +0000
(17:38 +0400)
committer
vbystricky
<user@user-pc.(none)>
Wed, 9 Apr 2014 10:49:37 +0000
(14:49 +0400)
modules/imgproc/src/moments.cpp
patch
|
blob
|
history
diff --git
a/modules/imgproc/src/moments.cpp
b/modules/imgproc/src/moments.cpp
index
9d92e47
..
f57b07f
100644
(file)
--- a/
modules/imgproc/src/moments.cpp
+++ b/
modules/imgproc/src/moments.cpp
@@
-466,7
+466,7
@@
cv::Moments cv::moments( InputArray _src, bool binary )
if( cn > 1 )
CV_Error( CV_StsBadArg, "Invalid image type (must be single-channel)" );
-#if defined HAVE_IPP && (IPP_VERSION_MAJOR
>= 8) && (IPP_VERSION_MINOR >=
1)
+#if defined HAVE_IPP && (IPP_VERSION_MAJOR
* 10 + IPP_VERSION_MINOR >= 8
1)
if (!binary)
{
IppiSize roi = {mat.cols, mat.rows};