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

Merge pull request #2679 from alalek:ippicv_update

Browse Source
This commit is contained in:
Alexander Alekhin
2014-05-07 18:24:40 +04:00
committed by OpenCV Buildbot
parent 9c780260c2 71f871fafd
commit 07d5f56707
27 changed files with 119 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/corner.cpp
+1 -1
View File
@@ -526,7 +526,7 @@ void cv::cornerHarris( InputArray _src, OutputArray _dst, int blockSize, int ksi
_dst.create( src.size(), CV_32FC1 );
Mat dst = _dst.getMat();
#if IPP_VERSION_X100 >= 801 && !defined HAVE_IPP_ICV_ONLY
#if IPP_VERSION_X100 >= 801
int type = src.type(), depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type);
int borderTypeNI = borderType & ~BORDER_ISOLATED;
bool isolated = (borderType & BORDER_ISOLATED) != 0;