core(stat): register dispatched code, fix build

alalek · alalek · commit c45d3568ae81 · 2017-07-02T22:45:10.000Z
diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(the_description "The Core Functionality")
 
 ocv_add_dispatched_file(mathfuncs_core SSE2 AVX AVX2)
+ocv_add_dispatched_file(stat SSE4_2 AVX AVX2)
 
 ocv_add_module(core
                "${OPENCV_HAL_LINKER_LIBS}"
diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp
@@ -4233,7 +4233,7 @@ cvNorm( const void* imgA, const void* imgB, int normType, const void* maskarr )
 
 namespace cv { namespace hal {
 
-static const uchar popCountTable[] =
+extern const uchar popCountTable[256] =
 {
     0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
     1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
diff --git a/modules/core/src/stat.simd.hpp b/modules/core/src/stat.simd.hpp
@@ -5,6 +5,9 @@
 #include "opencv2/core/hal/intrin.hpp"
 
 namespace cv { namespace hal {
+
+extern const uchar popCountTable[256];
+
 CV_CPU_OPTIMIZATION_NAMESPACE_BEGIN
 
 // forward declarations

Original file line number	Diff line number	Diff line change
`@@ -4233,7 +4233,7 @@ cvNorm( const void* imgA, const void* imgB, int normType, const void* maskarr )`
`4233`	`4233`
`4234`	`4234`	`namespace cv { namespace hal {`
`4235`	`4235`
`4236`		`-static const uchar popCountTable[] =`
	`4236`	`+extern const uchar popCountTable[256] =`
`4237`	`4237`	`{`
`4238`	`4238`	`0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,`
`4239`	`4239`	`1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,`