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

Protect check of CV_SSE4_2 with #if defined.

Browse Source
This commit is contained in:
Sam Bromley 2012-07-26 12:43:56 -02:30
parent 966a652142
commit fd98520d78
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/stat.cpp
View File

@ -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 )
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);
} }