Merge pull request #10962 from alalek:dnn_precomp_hpp

7 years ago · fe97dc67dc
parent 560ca8c5aa a838a97092
commit fe97dc67dc
10 changed files with 6 additions and 8 deletions
--- 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 <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
--- 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
--- 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 <opencv2/core/opencl/runtime/opencl_core.hpp>

--- 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
--- 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 <iomanip>
 #include <map>
 #include <memory>
--- 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 <Halide.h>
 #endif  // HAVE_HALIDE
--- 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 <inference_engine.hpp>
 #endif  // HAVE_INF_ENGINE
--- 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 <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
--- 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
--- 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
 {