Skip to content

O
opencv
Commit fd98520d authored by Sam Bromley's avatar Sam Bromley
Browse files
Options

Protect check of CV_SSE4_2 with #if defined.

parent 966a6521
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
modules/core/src/stat.cpp
View file @ fd98520d
...@@ -225,7 +225,7 @@ template <> ...@@ -225,7 +225,7 @@ template <>
int countNonZero_ <uchar> (const uchar* src, int len) int countNonZero_ <uchar> (const uchar* src, int len)
{ {
int i=0, nz = 0; int i=0, nz = 0;
#if CV_SSE4_2 #if (defined CV_SSE4_2 && CV_SSE4_2)
if(USE_SSE4_2)//5x-6x if(USE_SSE4_2)//5x-6x
{ {
__m128i pattern = _mm_setzero_si128 (); __m128i pattern = _mm_setzero_si128 ();
...@@ -2012,4 +2012,4 @@ cvNorm( const void* imgA, const void* imgB, int normType, const void* maskarr ) ...@@ -2012,4 +2012,4 @@ cvNorm( const void* imgA, const void* imgB, int normType, const void* maskarr )
cv::extractImageCOI(imgB, b); cv::extractImageCOI(imgB, b);
return !maskarr ? cv::norm(a, b, normType) : cv::norm(a, b, normType, mask); return !maskarr ? cv::norm(a, b, normType) : cv::norm(a, b, normType, mask);
} }
\ No newline at end of file
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