From a838a97092730966d514564d3651032c27d6deb7 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 28 Feb 2018 16:44:41 +0300 Subject: [PATCH] dnn: fix precomp.hpp usage --- modules/dnn/src/caffe/caffe_io.cpp | 2 ++ modules/dnn/src/layers/layers_common.cpp | 1 + modules/dnn/src/ocl4dnn/include/common.hpp | 1 - modules/dnn/src/ocl4dnn/include/math_functions.hpp | 1 - modules/dnn/src/ocl4dnn/include/ocl4dnn.hpp | 1 - modules/dnn/src/op_halide.hpp | 2 -- modules/dnn/src/op_inf_engine.hpp | 2 -- modules/dnn/src/tensorflow/tf_io.cpp | 2 ++ modules/dnn/test/npy_blob.cpp | 1 + modules/dnn/test/npy_blob.hpp | 1 - 10 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp index cb9738f6aa..f6b4eb373a 100644 --- a/modules/dnn/src/caffe/caffe_io.cpp +++ b/modules/dnn/src/caffe/caffe_io.cpp @@ -87,6 +87,8 @@ // //M*/ +#include "../precomp.hpp" + #ifdef HAVE_PROTOBUF #include #include diff --git a/modules/dnn/src/layers/layers_common.cpp b/modules/dnn/src/layers/layers_common.cpp index 8552a4a0cc..f854d91ccc 100644 --- a/modules/dnn/src/layers/layers_common.cpp +++ b/modules/dnn/src/layers/layers_common.cpp @@ -40,6 +40,7 @@ // //M*/ +#include "../precomp.hpp" #include "layers_common.hpp" namespace cv diff --git a/modules/dnn/src/ocl4dnn/include/common.hpp b/modules/dnn/src/ocl4dnn/include/common.hpp index 41466429b0..8eba83a24d 100644 --- a/modules/dnn/src/ocl4dnn/include/common.hpp +++ b/modules/dnn/src/ocl4dnn/include/common.hpp @@ -41,7 +41,6 @@ #ifndef _OPENCV_LIBDNN_COMMON_HPP_ #define _OPENCV_LIBDNN_COMMON_HPP_ -#include "../../precomp.hpp" #include "../../caffe/glog_emulator.hpp" #include diff --git a/modules/dnn/src/ocl4dnn/include/math_functions.hpp b/modules/dnn/src/ocl4dnn/include/math_functions.hpp index cac860490f..95cf9051dd 100644 --- a/modules/dnn/src/ocl4dnn/include/math_functions.hpp +++ b/modules/dnn/src/ocl4dnn/include/math_functions.hpp @@ -42,7 +42,6 @@ #ifndef _OPENCV_GREENTEA_MATH_FUNCTIONS_HPP_ #define _OPENCV_GREENTEA_MATH_FUNCTIONS_HPP_ -#include "../../precomp.hpp" #include "common.hpp" namespace cv diff --git a/modules/dnn/src/ocl4dnn/include/ocl4dnn.hpp b/modules/dnn/src/ocl4dnn/include/ocl4dnn.hpp index 70ced11276..3ab36e90c0 100644 --- a/modules/dnn/src/ocl4dnn/include/ocl4dnn.hpp +++ b/modules/dnn/src/ocl4dnn/include/ocl4dnn.hpp @@ -42,7 +42,6 @@ #ifndef _OPENCV_LIBDNN_HPP_ #define _OPENCV_LIBDNN_HPP_ -#include "../../precomp.hpp" #include #include #include diff --git a/modules/dnn/src/op_halide.hpp b/modules/dnn/src/op_halide.hpp index 715293d3de..07983ff41a 100644 --- a/modules/dnn/src/op_halide.hpp +++ b/modules/dnn/src/op_halide.hpp @@ -8,8 +8,6 @@ #ifndef __OPENCV_DNN_OP_HALIDE_HPP__ #define __OPENCV_DNN_OP_HALIDE_HPP__ -#include "precomp.hpp" - #ifdef HAVE_HALIDE #include #endif // HAVE_HALIDE diff --git a/modules/dnn/src/op_inf_engine.hpp b/modules/dnn/src/op_inf_engine.hpp index f26d467f23..72e4d0db2a 100644 --- a/modules/dnn/src/op_inf_engine.hpp +++ b/modules/dnn/src/op_inf_engine.hpp @@ -8,8 +8,6 @@ #ifndef __OPENCV_DNN_OP_INF_ENGINE_HPP__ #define __OPENCV_DNN_OP_INF_ENGINE_HPP__ -#include "precomp.hpp" - #ifdef HAVE_INF_ENGINE #include #endif // HAVE_INF_ENGINE diff --git a/modules/dnn/src/tensorflow/tf_io.cpp b/modules/dnn/src/tensorflow/tf_io.cpp index 7a5261391e..ef26b30f44 100644 --- a/modules/dnn/src/tensorflow/tf_io.cpp +++ b/modules/dnn/src/tensorflow/tf_io.cpp @@ -9,6 +9,8 @@ Implementation of various functions which are related to Tensorflow models reading. */ +#include "../precomp.hpp" + #ifdef HAVE_PROTOBUF #include #include diff --git a/modules/dnn/test/npy_blob.cpp b/modules/dnn/test/npy_blob.cpp index 0b4664eec8..a966801af6 100644 --- a/modules/dnn/test/npy_blob.cpp +++ b/modules/dnn/test/npy_blob.cpp @@ -5,6 +5,7 @@ // Copyright (C) 2017, Intel Corporation, all rights reserved. // Third party copyrights are property of their respective owners. +#include "test_precomp.hpp" #include "npy_blob.hpp" namespace cv diff --git a/modules/dnn/test/npy_blob.hpp b/modules/dnn/test/npy_blob.hpp index f46db78764..60a7c2671a 100644 --- a/modules/dnn/test/npy_blob.hpp +++ b/modules/dnn/test/npy_blob.hpp @@ -7,7 +7,6 @@ #ifndef __OPENCV_DNN_TEST_NPY_BLOB_HPP__ #define __OPENCV_DNN_TEST_NPY_BLOB_HPP__ -#include "test_precomp.hpp" namespace cv {