mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rewritten for new macro use

Browse Source
This commit is contained in:
Rostislav Vasilikhin 2016-12-14 18:08:09 +03:00
parent ee77538cf9
commit 1e2ad7e3e3
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/imgproc/src/featureselect.cpp
View File

@ -42,11 +42,7 @@
#include "precomp.hpp"
#include "opencl_kernels_imgproc.hpp"
#ifdef HAVE_OPENVX
#define IVX_USE_OPENCV
#define IVX_HIDE_INFO_WARNINGS
#include "ivx.hpp"
#endif
#include "opencv2/core/openvx/ovx_defs.hpp"
#include <cstdio>
#include <vector>
@ -346,13 +342,11 @@ static bool openvx_harris(Mat image, OutputArray _corners,
}
catch (RuntimeError & e)
{
CV_Error(cv::Error::StsInternal, e.what());
return false;
VX_DbgThrow(e.what());
}
catch (WrapperError & e)
{
CV_Error(cv::Error::StsInternal, e.what());
return false;
VX_DbgThrow(e.what());
}
return true;
@ -383,15 +377,9 @@ void cv::goodFeaturesToTrack( InputArray _image, OutputArray _corners,
return;
}
#ifdef HAVE_OPENVX
// Disabled due to bad accuracy
if(false &&
useHarrisDetector && _mask.empty() &&
openvx_harris(image, _corners, maxCorners, qualityLevel, minDistance, blockSize, harrisK))
{
return;
}
#endif
CV_OVX_RUN(false && useHarrisDetector && _mask.empty(),
openvx_harris(image, _corners, maxCorners, qualityLevel, minDistance, blockSize, harrisK))
if( useHarrisDetector )
cornerHarris( image, eig, blockSize, 3, harrisK );