invoking OCL before IPP

mike-lawrence · Jun 16, 2014 · d5244eb · d5244eb
1 parent 45f21e4
commit d5244eb
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/modules/imgproc/src/morph.cpp b/modules/imgproc/src/morph.cpp
@@ -1468,11 +1468,6 @@ static void morphOp( int op, InputArray _src, OutputArray _dst,
     Size ksize = kernel.data ? kernel.size() : Size(3,3);
     anchor = normalizeAnchor(anchor, ksize);
 
-#if IPP_VERSION_X100 >= 801
-    if( IPPMorphOp(op, _src, _dst, kernel, anchor, iterations, borderType, borderValue) )
-        return;
-#endif
-
     if (iterations == 0 || kernel.rows*kernel.cols == 1)
     {
         _src.copyTo(_dst);
@@ -1501,8 +1496,12 @@ static void morphOp( int op, InputArray _src, OutputArray _dst,
                (op == MORPH_ERODE || op == MORPH_DILATE),
                ocl_morphology_op(_src, _dst, kernel, ksize, anchor, iterations, op) )
 
-    Mat src = _src.getMat();
+#if IPP_VERSION_X100 >= 801
+    if( IPPMorphOp(op, _src, _dst, kernel, anchor, iterations, borderType, borderValue) )
+        return;
+#endif
 
+    Mat src = _src.getMat();
     _dst.create( src.size(), src.type() );
     Mat dst = _dst.getMat();