Commit 845d3edb authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #3757 from ilya-lavrenov:popcnp

parents 0a5df016 b963d84b
...@@ -517,9 +517,11 @@ static const uchar * initPopcountTable() ...@@ -517,9 +517,11 @@ static const uchar * initPopcountTable()
unsigned int j = 0u; unsigned int j = 0u;
#if CV_POPCNT #if CV_POPCNT
if (checkHardwareSupport(CV_CPU_POPCNT)) if (checkHardwareSupport(CV_CPU_POPCNT))
{
for( ; j < 256u; j++ ) for( ; j < 256u; j++ )
tab[j] = (uchar)(8 - _mm_popcnt_u32(j)); tab[j] = (uchar)(8 - _mm_popcnt_u32(j));
#else }
#endif
for( ; j < 256u; j++ ) for( ; j < 256u; j++ )
{ {
int val = 0; int val = 0;
...@@ -527,7 +529,6 @@ static const uchar * initPopcountTable() ...@@ -527,7 +529,6 @@ static const uchar * initPopcountTable()
val += (j & mask) == 0; val += (j & mask) == 0;
tab[j] = (uchar)val; tab[j] = (uchar)val;
} }
#endif
initialized = true; initialized = true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment