Merge branch 'master' of git://code.opencv.org/opencv

f160c494 · Philipp Wagner · 79b45b13 · f1690557 · f160c494
Commit f160c494 authored Jul 29, 2012 by Philipp Wagner
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

stat.cpp modules/core/src/stat.cpp +1 -1

No files found.
--- a/modules/core/src/stat.cpp
+++ b/modules/core/src/stat.cpp
@@ -225,7 +225,7 @@ template <>
 int countNonZero_ <uchar> (const uchar* src, int len)
 {
 	int i=0, nz = 0;
-	#if (defined CV_SSE4_2 && CV_SSE4_2)
+	#if (defined CV_SSE4_2 && CV_SSE4_2 && (_WIN64 || __amd64__))
 	if(USE_SSE4_2)//5x-6x
 	{
 		__m128i pattern = _mm_setzero_si128 ();