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

Added ippiComputeThreshold_Otsu to cv::threshold

Browse Source
This commit is contained in:
Alexander Karsakov 2014-04-25 17:31:45 +04:00
parent 32b25de583
commit 232c37e827
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/imgproc/src/thresh.cpp
View File

@ -675,16 +675,29 @@ static double
getThreshVal_Otsu_8u( const Mat& _src ) getThreshVal_Otsu_8u( const Mat& _src )
{ {
Size size = _src.size(); Size size = _src.size();
int step = (int) _src.step;
if( _src.isContinuous() ) if( _src.isContinuous() )
{ {
size.width *= size.height; size.width *= size.height;
size.height = 1; size.height = 1;
step = size.width;
} }
#if defined(HAVE_IPP) && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 801
IppiSize srcSize = { size.width, size.height };
Ipp8u thresh;
CV_SUPPRESS_DEPRECATED_START
IppStatus ok = ippiComputeThreshold_Otsu_8u_C1R(_src.data, step, srcSize, &thresh);
CV_SUPPRESS_DEPRECATED_END
if (ok >= 0)
return thresh;
#endif
const int N = 256; const int N = 256;
int i, j, h[N] = {0}; int i, j, h[N] = {0};
for( i = 0; i < size.height; i++ ) for( i = 0; i < size.height; i++ )
{ {
const uchar* src = _src.data + _src.step*i; const uchar* src = _src.data + step*i;
j = 0; j = 0;
#if CV_ENABLE_UNROLLED #if CV_ENABLE_UNROLLED
for( ; j <= size.width - 4; j += 4 ) for( ; j <= size.width - 4; j += 4 )