Skip to content

O
opencv
Commit c0f2a8e0 authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Fix build without SSE

parent febfdc9f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/imgproc/src/color.cpp
View file @ c0f2a8e0
...@@ -2168,7 +2168,7 @@ static void Bayer2RGB_VNG_8u( const Mat& srcmat, Mat& dstmat, int code ) ...@@ -2168,7 +2168,7 @@ static void Bayer2RGB_VNG_8u( const Mat& srcmat, Mat& dstmat, int code )
bayer += bstep*2; bayer += bstep*2;
#ifdef CV_SSE2 #if CV_SSE2
bool haveSSE = cv::checkHardwareSupport(CV_CPU_SSE2); bool haveSSE = cv::checkHardwareSupport(CV_CPU_SSE2);
#define _mm_absdiff_epu16(a,b) _mm_adds_epu16(_mm_subs_epu16(a, b), _mm_subs_epu16(b, a)) #define _mm_absdiff_epu16(a,b) _mm_adds_epu16(_mm_subs_epu16(a, b), _mm_subs_epu16(b, a))
#endif #endif
...@@ -2188,7 +2188,7 @@ static void Bayer2RGB_VNG_8u( const Mat& srcmat, Mat& dstmat, int code ) ...@@ -2188,7 +2188,7 @@ static void Bayer2RGB_VNG_8u( const Mat& srcmat, Mat& dstmat, int code )
i = 1; i = 1;
#ifdef CV_SSE2 #if CV_SSE2
if( haveSSE ) if( haveSSE )
{ {
__m128i z = _mm_setzero_si128(); __m128i z = _mm_setzero_si128();
...@@ -2263,7 +2263,7 @@ static void Bayer2RGB_VNG_8u( const Mat& srcmat, Mat& dstmat, int code ) ...@@ -2263,7 +2263,7 @@ static void Bayer2RGB_VNG_8u( const Mat& srcmat, Mat& dstmat, int code )
bool greenCell = greenCell0; bool greenCell = greenCell0;
i = 2; i = 2;
#ifdef CV_SSE2 #if CV_SSE2
int limit = !haveSSE ? N-2 : greenCell ? std::min(3, N-2) : 2; int limit = !haveSSE ? N-2 : greenCell ? std::min(3, N-2) : 2;
#else #else
int limit = N - 2; int limit = N - 2;
...@@ -2431,7 +2431,7 @@ static void Bayer2RGB_VNG_8u( const Mat& srcmat, Mat& dstmat, int code ) ...@@ -2431,7 +2431,7 @@ static void Bayer2RGB_VNG_8u( const Mat& srcmat, Mat& dstmat, int code )
greenCell = !greenCell; greenCell = !greenCell;
} }
#ifdef CV_SSE2 #if CV_SSE2
if( !haveSSE ) if( !haveSSE )
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment