[opencv] 138/251: fix linker error when trying CPU_BASELINE=AVX

[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 0f91faddae43bfe1a859be741ce4ec9a5fe5b338
Author: Tomoaki Teshima <tomoaki.teshima at gmail.com>
Date:   Fri Jul 21 21:13:47 2017 +0900

    fix linker error when trying CPU_BASELINE=AVX
---
 modules/dnn/src/layers/layers_common.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/dnn/src/layers/layers_common.hpp b/modules/dnn/src/layers/layers_common.hpp
index f34646a..c206f9f 100644
--- a/modules/dnn/src/layers/layers_common.hpp
+++ b/modules/dnn/src/layers/layers_common.hpp
@@ -45,9 +45,11 @@
 #include <opencv2/dnn.hpp>
 #include <opencv2/dnn/shape_utils.hpp>
 
+#define CV_CPU_OPTIMIZATION_DECLARATIONS_ONLY
 // dispatched AVX/AVX2 optimizations
 #include "layers/layers_common.simd.hpp"
 #include "layers/layers_common.simd_declarations.hpp"
+#undef CV_CPU_OPTIMIZATION_DECLARATIONS_ONLY
 
 namespace cv
 {

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