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

This commit is contained in:
Philipp Wagner 2012-07-29 22:20:48 +02:00
commit f160c49473

View File

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