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

invoking OCL before IPP

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-06-16 12:33:13 +04:00
parent 45f21e4f12
commit d5244eb645
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/imgproc/src/morph.cpp
View File

@ -1468,11 +1468,6 @@ static void morphOp( int op, InputArray _src, OutputArray _dst,
Size ksize = kernel.data ? kernel.size() : Size(3,3); Size ksize = kernel.data ? kernel.size() : Size(3,3);
anchor = normalizeAnchor(anchor, ksize); 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) if (iterations == 0 || kernel.rows*kernel.cols == 1)
{ {
_src.copyTo(_dst); _src.copyTo(_dst);
@ -1501,8 +1496,12 @@ static void morphOp( int op, InputArray _src, OutputArray _dst,
(op == MORPH_ERODE || op == MORPH_DILATE), (op == MORPH_ERODE || op == MORPH_DILATE),
ocl_morphology_op(_src, _dst, kernel, ksize, anchor, iterations, op) ) 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() ); _dst.create( src.size(), src.type() );
Mat dst = _dst.getMat(); Mat dst = _dst.getMat();