[opencv] 76/251: Merge pull request #9074 from alalek:cpu_dispatch_core_hamming

[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 4e39d0371de6237969bf04621556631ddda8ec6f
Merge: 11feae6 b3f5e3b
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Fri Jul 14 16:48:07 2017 +0000

    Merge pull request #9074 from alalek:cpu_dispatch_core_hamming
    
    cpu dispatch(core): hamming

 cmake/OpenCVCompilerOptimizations.cmake            |   2 +-
 modules/core/CMakeLists.txt                        |   1 +
 .../core/include/opencv2/core/cv_cpu_dispatch.h    |   6 +
 modules/core/src/stat.cpp                          | 164 +-------------------
 modules/core/src/stat.dispatch.cpp                 |  28 ++++
 modules/core/src/stat.simd.hpp                     | 171 +++++++++++++++++++++
 6 files changed, 210 insertions(+), 162 deletions(-)

diff --cc modules/core/include/opencv2/core/cv_cpu_dispatch.h
index 06e1bfa,779039d..702f11e
--- a/modules/core/include/opencv2/core/cv_cpu_dispatch.h
+++ b/modules/core/include/opencv2/core/cv_cpu_dispatch.h
@@@ -108,9 -108,15 +108,15 @@@ struct VZeroUpperGuard 
  #endif
      inline ~VZeroUpperGuard() { _mm256_zeroupper(); }
  };
 -#define __CV_AVX_GUARD VZeroUpperGuard __vzeroupper_guard;
 +#define __CV_AVX_GUARD VZeroUpperGuard __vzeroupper_guard; (void)__vzeroupper_guard;
  #endif
  
+ #ifdef __CV_AVX_GUARD
+ #define CV_AVX_GUARD __CV_AVX_GUARD
+ #else
+ #define CV_AVX_GUARD
+ #endif
+ 
  #endif // __OPENCV_BUILD
  
  

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