mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

check the CPU flag correctly

Browse Source
This commit is contained in:
Tomoaki Teshima 2016-07-13 07:10:20 +09:00
parent 1095076d7f
commit 9fca953e62
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,7 +397,7 @@ thresh_16s( const Mat& _src, Mat& _dst, short thresh, short maxval, int type )
size_t dst_step = _dst.step/sizeof(dst[0]); size_t dst_step = _dst.step/sizeof(dst[0]);
#if CV_SSE2 #if CV_SSE2
volatile bool useSIMD = checkHardwareSupport(CV_CPU_SSE); volatile bool useSIMD = checkHardwareSupport(CV_CPU_SSE2);
#endif #endif
if( _src.isContinuous() && _dst.isContinuous() ) if( _src.isContinuous() && _dst.isContinuous() )
@ -665,7 +665,7 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )
size_t src_step = _src.step/sizeof(src[0]); size_t src_step = _src.step/sizeof(src[0]);
size_t dst_step = _dst.step/sizeof(dst[0]); size_t dst_step = _dst.step/sizeof(dst[0]);
#if CV_SSE2 #if CV_SSE
volatile bool useSIMD = checkHardwareSupport(CV_CPU_SSE); volatile bool useSIMD = checkHardwareSupport(CV_CPU_SSE);
#endif #endif
@ -720,7 +720,7 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )
for( i = 0; i < roi.height; i++, src += src_step, dst += dst_step ) for( i = 0; i < roi.height; i++, src += src_step, dst += dst_step )
{ {
j = 0; j = 0;
#if CV_SSE2 #if CV_SSE
if( useSIMD ) if( useSIMD )
{ {
__m128 thresh4 = _mm_set1_ps(thresh), maxval4 = _mm_set1_ps(maxval); __m128 thresh4 = _mm_set1_ps(thresh), maxval4 = _mm_set1_ps(maxval);
@ -758,7 +758,7 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )
for( i = 0; i < roi.height; i++, src += src_step, dst += dst_step ) for( i = 0; i < roi.height; i++, src += src_step, dst += dst_step )
{ {
j = 0; j = 0;
#if CV_SSE2 #if CV_SSE
if( useSIMD ) if( useSIMD )
{ {
__m128 thresh4 = _mm_set1_ps(thresh), maxval4 = _mm_set1_ps(maxval); __m128 thresh4 = _mm_set1_ps(thresh), maxval4 = _mm_set1_ps(maxval);
@ -796,7 +796,7 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )
for( i = 0; i < roi.height; i++, src += src_step, dst += dst_step ) for( i = 0; i < roi.height; i++, src += src_step, dst += dst_step )
{ {
j = 0; j = 0;
#if CV_SSE2 #if CV_SSE
if( useSIMD ) if( useSIMD )
{ {
__m128 thresh4 = _mm_set1_ps(thresh); __m128 thresh4 = _mm_set1_ps(thresh);
@ -827,7 +827,7 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )
for( i = 0; i < roi.height; i++, src += src_step, dst += dst_step ) for( i = 0; i < roi.height; i++, src += src_step, dst += dst_step )
{ {
j = 0; j = 0;
#if CV_SSE2 #if CV_SSE
if( useSIMD ) if( useSIMD )
{ {
__m128 thresh4 = _mm_set1_ps(thresh); __m128 thresh4 = _mm_set1_ps(thresh);
@ -866,7 +866,7 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )
for( i = 0; i < roi.height; i++, src += src_step, dst += dst_step ) for( i = 0; i < roi.height; i++, src += src_step, dst += dst_step )
{ {
j = 0; j = 0;
#if CV_SSE2 #if CV_SSE
if( useSIMD ) if( useSIMD )
{ {
__m128 thresh4 = _mm_set1_ps(thresh); __m128 thresh4 = _mm_set1_ps(thresh);
@ -916,7 +916,7 @@ thresh_64f(const Mat& _src, Mat& _dst, double thresh, double maxval, int type)
size_t dst_step = _dst.step / sizeof(dst[0]); size_t dst_step = _dst.step / sizeof(dst[0]);
#if CV_SSE2 #if CV_SSE2
volatile bool useSIMD = checkHardwareSupport(CV_CPU_SSE); volatile bool useSIMD = checkHardwareSupport(CV_CPU_SSE2);
#endif #endif
if (_src.isContinuous() && _dst.isContinuous()) if (_src.isContinuous() && _dst.isContinuous())