Merge pull request #2645 from vbystricky:ipp_Convert

caf3ed28 · Alexander Alekhin · OpenCV Buildbot · 4211d8fb · 9cdb3304 · caf3ed28
Commit caf3ed28 authored Apr 22, 2014 by Alexander Alekhin Committed by OpenCV Buildbot Apr 22, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 6 deletions

convert.cpp modules/core/src/convert.cpp +12 -6

No files found.
--- a/modules/core/src/convert.cpp
+++ b/modules/core/src/convert.cpp
@@ -1084,9 +1084,12 @@ dtype* dst, size_t dstep, Size size, double* scale) \
 static void cvt##suffix( const stype* src, size_t sstep, const uchar*, size_t, \
                         dtype* dst, size_t dstep, Size size, double*) \
 { \
-    if (ippiConvert_##ippFavor(src, (int)sstep, dst, (int)dstep, ippiSize(size.width, size.height)) >= 0) \
-        return; \
-    setIppErrorStatus(); \
+    if (src && dst)\
+    {\
+        if (ippiConvert_##ippFavor(src, (int)sstep, dst, (int)dstep, ippiSize(size.width, size.height)) >= 0) \
+            return; \
+        setIppErrorStatus(); \
+    }\
    cvt_(src, sstep, dst, dstep, size); \
 }

@@ -1094,9 +1097,12 @@ static void cvt##suffix( const stype* src, size_t sstep, const uchar*, size_t, \
 static void cvt##suffix( const stype* src, size_t sstep, const uchar*, size_t, \
                         dtype* dst, size_t dstep, Size size, double*) \
 { \
-    if (ippiConvert_##ippFavor(src, (int)sstep, dst, (int)dstep, ippiSize(size.width, size.height), ippRndFinancial, 0) >= 0) \
-        return; \
-    setIppErrorStatus(); \
+    if (src && dst)\
+    {\
+        if (ippiConvert_##ippFavor(src, (int)sstep, dst, (int)dstep, ippiSize(size.width, size.height), ippRndFinancial, 0) >= 0) \
+            return; \
+        setIppErrorStatus(); \
+    }\
    cvt_(src, sstep, dst, dstep, size); \
 }
 #else