mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

core(stat): stat.cpp minor refactoring

Browse Source 
- remove unused code
- added: #if CV_ENABLE_UNROLLED in Hamming's functions
This commit is contained in:
Alexander Alekhin 2017-07-02 13:01:29 +00:00
parent 4f558e8b89
commit 03c3e0edcf
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,16 +53,6 @@
namespace cv namespace cv
{ {
template<typename T> static inline Scalar rawToScalar(const T& v)
{
Scalar s;
typedef typename DataType<T>::channel_type T1;
int i, n = DataType<T>::channels;
for( i = 0; i < n; i++ )
s.val[i] = ((T1*)&v)[i];
return s;
}
/****************************************************************************************\ /****************************************************************************************\
* sum * * sum *
\****************************************************************************************/ \****************************************************************************************/
@ -4344,12 +4334,13 @@ int normHamming(const uchar* a, int n)
result += v_reduce_sum(t); result += v_reduce_sum(t);
} }
#endif // CV_SIMD128 #endif // CV_SIMD128
#if CV_ENABLE_UNROLLED
for(; i <= n - 4; i += 4) for(; i <= n - 4; i += 4)
{ {
result += popCountTable[a[i]] + popCountTable[a[i+1]] + result += popCountTable[a[i]] + popCountTable[a[i+1]] +
popCountTable[a[i+2]] + popCountTable[a[i+3]]; popCountTable[a[i+2]] + popCountTable[a[i+3]];
} }
#endif
for(; i < n; i++) for(; i < n; i++)
{ {
result += popCountTable[a[i]]; result += popCountTable[a[i]];
@ -4415,12 +4406,13 @@ int normHamming(const uchar* a, const uchar* b, int n)
result += v_reduce_sum(t); result += v_reduce_sum(t);
} }
#endif // CV_SIMD128 #endif // CV_SIMD128
#if CV_ENABLE_UNROLLED
for(; i <= n - 4; i += 4) for(; i <= n - 4; i += 4)
{ {
result += popCountTable[a[i] ^ b[i]] + popCountTable[a[i+1] ^ b[i+1]] + result += popCountTable[a[i] ^ b[i]] + popCountTable[a[i+1] ^ b[i+1]] +
popCountTable[a[i+2] ^ b[i+2]] + popCountTable[a[i+3] ^ b[i+3]]; popCountTable[a[i+2] ^ b[i+2]] + popCountTable[a[i+3] ^ b[i+3]];
} }
#endif
for(; i < n; i++) for(; i < n; i++)
{ {
result += popCountTable[a[i] ^ b[i]]; result += popCountTable[a[i] ^ b[i]];
@ -4463,11 +4455,11 @@ int normHamming(const uchar* a, const uchar* b, int n, int cellSize)
return -1; return -1;
int i = 0; int i = 0;
int result = 0; int result = 0;
#if CV_ENABLE_UNROLLED #if CV_ENABLE_UNROLLED
for( ; i <= n - 4; i += 4 ) for( ; i <= n - 4; i += 4 )
result += tab[a[i] ^ b[i]] + tab[a[i+1] ^ b[i+1]] + result += tab[a[i] ^ b[i]] + tab[a[i+1] ^ b[i+1]] +
tab[a[i+2] ^ b[i+2]] + tab[a[i+3] ^ b[i+3]]; tab[a[i+2] ^ b[i+2]] + tab[a[i+3] ^ b[i+3]];
#endif #endif
for( ; i < n; i++ ) for( ; i < n; i++ )
result += tab[a[i] ^ b[i]]; result += tab[a[i] ^ b[i]];
return result; return result;