[opencv] 04/251: core(stat): stat.cpp minor refactoring

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit 03c3e0edcfd9b38f166d382ad7a1643bc02b68bb
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Sun Jul 2 13:01:29 2017 +0000

    core(stat): stat.cpp minor refactoring
    
    - remove unused code
    - added: #if CV_ENABLE_UNROLLED in Hamming's functions
---
 modules/core/src/stat.cpp | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp
index d40e91a..5ea3563 100644
--- a/modules/core/src/stat.cpp
+++ b/modules/core/src/stat.cpp
@@ -53,16 +53,6 @@
 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                                             *
 \****************************************************************************************/
@@ -4344,12 +4334,13 @@ int normHamming(const uchar* a, int n)
         result += v_reduce_sum(t);
     }
 #endif // CV_SIMD128
-
+#if CV_ENABLE_UNROLLED
     for(; i <= n - 4; i += 4)
     {
         result += popCountTable[a[i]] + popCountTable[a[i+1]] +
         popCountTable[a[i+2]] + popCountTable[a[i+3]];
     }
+#endif
     for(; i < n; i++)
     {
         result += popCountTable[a[i]];
@@ -4415,12 +4406,13 @@ int normHamming(const uchar* a, const uchar* b, int n)
         result += v_reduce_sum(t);
     }
 #endif // CV_SIMD128
-
+#if CV_ENABLE_UNROLLED
     for(; i <= n - 4; i += 4)
     {
         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]];
     }
+#endif
     for(; i < n; 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;
     int i = 0;
     int result = 0;
-    #if CV_ENABLE_UNROLLED
+#if CV_ENABLE_UNROLLED
     for( ; i <= n - 4; i += 4 )
         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]];
-    #endif
+#endif
     for( ; i < n; i++ )
         result += tab[a[i] ^ b[i]];
     return result;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git