From fd98520d7830b061bfe8b72a161920c0a7fb1cb8 Mon Sep 17 00:00:00 2001 From: Sam Bromley Date: Thu, 26 Jul 2012 12:43:56 -0230 Subject: [PATCH] Protect check of CV_SSE4_2 with #if defined. --- modules/core/src/stat.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp index 3626a2a67..560ef5462 100644 --- a/modules/core/src/stat.cpp +++ b/modules/core/src/stat.cpp @@ -225,7 +225,7 @@ template <> int countNonZero_ (const uchar* src, int len) { int i=0, nz = 0; - #if CV_SSE4_2 + #if (defined CV_SSE4_2 && CV_SSE4_2) if(USE_SSE4_2)//5x-6x { __m128i pattern = _mm_setzero_si128 (); @@ -2012,4 +2012,4 @@ cvNorm( const void* imgA, const void* imgB, int normType, const void* maskarr ) cv::extractImageCOI(imgB, b); return !maskarr ? cv::norm(a, b, normType) : cv::norm(a, b, normType, mask); -} \ No newline at end of file +}