potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Restored IPP call reduction

Browse Source
This commit is contained in:
Maksim Shabunin
2019-07-31 15:41:22 +03:00
parent d3cf0d2c06
commit 6d5ac67681
11 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/morph.dispatch.cpp
+5 -5
View File
@@ -221,7 +221,7 @@ static bool halMorph(int op, int src_type, int dst_type,
}
// ===== 2. IPP implementation
#ifdef HAVE_IPP
#if 0 //defined HAVE_IPP
#ifdef HAVE_IPP_IW
static inline IwiMorphologyType ippiGetMorphologyType(int morphOp)
{
@@ -495,12 +495,12 @@ void morph(int op, int src_type, int dst_type,
return;
}
CV_IPP_RUN_FAST(ippMorph(op, src_type, dst_type, src_data, src_step, dst_data, dst_step, width, height,
/*CV_IPP_RUN_FAST(ippMorph(op, src_type, dst_type, src_data, src_step, dst_data, dst_step, width, height,
roi_width, roi_height, roi_x, roi_y,
roi_width2, roi_height2, roi_x2, roi_y2,
kernel_type, kernel_data, kernel_step,
kernel_width, kernel_height, anchor_x, anchor_y,
borderType, borderValue, iterations, isSubmatrix));
borderType, borderValue, iterations, isSubmatrix));*/
ocvMorph(op, src_type, dst_type, src_data, src_step, dst_data, dst_step, width, height,
roi_width, roi_height, roi_x, roi_y,
@@ -1079,7 +1079,7 @@ static bool ocl_morphologyEx(InputArray _src, OutputArray _dst, int op,
#endif
#define IPP_DISABLE_MORPH_ADV 1
#ifdef HAVE_IPP
#if 0 //defined HAVE_IPP
#if !IPP_DISABLE_MORPH_ADV
static bool ipp_morphologyEx(int op, InputArray _src, OutputArray _dst,
InputArray _kernel,
@@ -1174,7 +1174,7 @@ void morphologyEx( InputArray _src, OutputArray _dst, int op,
Mat dst = _dst.getMat();
#if !IPP_DISABLE_MORPH_ADV
CV_IPP_RUN_FAST(ipp_morphologyEx(op, src, dst, kernel, anchor, iterations, borderType, borderValue));
//CV_IPP_RUN_FAST(ipp_morphologyEx(op, src, dst, kernel, anchor, iterations, borderType, borderValue));
#endif
switch( op )