Merge pull request opencv#7986 from atinfinity:pullreq/170109-add_USE_AVX2_condition

alalek · alalek · commit e6d7989b203b · 2017-01-09T16:11:00.000Z
diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp
@@ -4253,6 +4253,7 @@ int normHamming(const uchar* a, int n)
         result += vgetq_lane_s32 (vreinterpretq_s32_u64(bitSet2),2);
     }
 #elif CV_AVX2
+    if (USE_AVX2)
     {
         __m256i _r0 = _mm256_setzero_si256();
         __m256i _0 = _mm256_setzero_si256();
@@ -4303,6 +4304,7 @@ int normHamming(const uchar* a, const uchar* b, int n)
         result += vgetq_lane_s32 (vreinterpretq_s32_u64(bitSet2),2);
     }
 #elif CV_AVX2
+    if (USE_AVX2)
     {
         __m256i _r0 = _mm256_setzero_si256();
         __m256i _0 = _mm256_setzero_si256();

Original file line number	Diff line number	Diff line change
`@@ -4253,6 +4253,7 @@ int normHamming(const uchar* a, int n)`
`4253`	`4253`	`result += vgetq_lane_s32 (vreinterpretq_s32_u64(bitSet2),2);`
`4254`	`4254`	`}`
`4255`	`4255`	`#elif CV_AVX2`
	`4256`	`+ if (USE_AVX2)`
`4256`	`4257`	`{`
`4257`	`4258`	`__m256i _r0 = _mm256_setzero_si256();`
`4258`	`4259`	`__m256i _0 = _mm256_setzero_si256();`
`@@ -4303,6 +4304,7 @@ int normHamming(const uchar* a, const uchar* b, int n)`
`4303`	`4304`	`result += vgetq_lane_s32 (vreinterpretq_s32_u64(bitSet2),2);`
`4304`	`4305`	`}`
`4305`	`4306`	`#elif CV_AVX2`
	`4307`	`+ if (USE_AVX2)`
`4306`	`4308`	`{`
`4307`	`4309`	`__m256i _r0 = _mm256_setzero_si256();`
`4308`	`4310`	`__m256i _0 = _mm256_setzero_si256();`