core: include version.hpp in cvdef.h, fix precomp.hpp usage

diff --git a/modules/core/include/opencv2/core.hpp b/modules/core/include/opencv2/core.hpp
index fc2432dcdf6b099329d0942d6caf3eff0597c657..be0a3a0dc54b688eb933baa0367ff9db8596bfb3 100644 (file)
--- a/modules/core/include/opencv2/core.hpp
+++ b/modules/core/include/opencv2/core.hpp
@@ -50,7 +50,6 @@
 #endif
 
 #include "opencv2/core/cvdef.h"
-#include "opencv2/core/version.hpp"
 #include "opencv2/core/base.hpp"
 #include "opencv2/core/cvstd.hpp"
 #include "opencv2/core/traits.hpp"

diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h
index 6488b8bd4f0395c242306700d6dfc23585132e9e..38f9eed452aa1c952858df61a908134c6fdc2e2d 100644 (file)
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@@ -45,6 +45,8 @@
 #ifndef OPENCV_CORE_CVDEF_H
 #define OPENCV_CORE_CVDEF_H
 
+#include "opencv2/core/version.hpp"
+
 //! @addtogroup core_utils
 //! @{
 

diff --git a/modules/core/include/opencv2/core/simd_intrinsics.hpp b/modules/core/include/opencv2/core/simd_intrinsics.hpp
index 7151d3607362136e7138823822db461942b0e33a..309202d123104808a51a58fdfa91696951274ceb 100644 (file)
--- a/modules/core/include/opencv2/core/simd_intrinsics.hpp
+++ b/modules/core/include/opencv2/core/simd_intrinsics.hpp
@@ -40,7 +40,6 @@ Notes:
 #endif
 
 #include "opencv2/core/cvdef.h"
-#include "opencv2/core/version.hpp"
 
 #ifdef OPENCV_SIMD_CONFIG_HEADER
 #include CVAUX_STR(OPENCV_SIMD_CONFIG_HEADER)

diff --git a/modules/core/src/hal_internal.cpp b/modules/core/src/hal_internal.cpp
index 60f96c01646c2087420f33b7190455aa712e18a5..483281d1f70c753561c4253439d77c283c50bd9e 100644 (file)
--- a/modules/core/src/hal_internal.cpp
+++ b/modules/core/src/hal_internal.cpp
@@ -42,6 +42,7 @@
 //
 //M*/
 
+#include "precomp.hpp"
 #include "hal_internal.hpp"
 
 #ifdef HAVE_LAPACK

diff --git a/modules/core/src/hal_internal.hpp b/modules/core/src/hal_internal.hpp
index 129a71014541fa25a1db570c34fdceb21cf44f50..c7a0d46de4e88529821fa3e09398a8bb124eae97 100644 (file)
--- a/modules/core/src/hal_internal.hpp
+++ b/modules/core/src/hal_internal.hpp
@@ -45,8 +45,6 @@
 #ifndef OPENCV_CORE_HAL_INTERNAL_HPP
 #define OPENCV_CORE_HAL_INTERNAL_HPP
 
-#include "precomp.hpp"
-
 #ifdef HAVE_LAPACK
 
 int lapack_LU32f(float* a, size_t a_step, int m, float* b, size_t b_step, int n, int* info);

diff --git a/modules/core/src/intel_gpu_gemm.inl.hpp b/modules/core/src/intel_gpu_gemm.inl.hpp
index 729b43f604d1ed5c4781660f6c255a42fe8afd81..fbd567b949e36efa743392d6279358882d6a16a6 100644 (file)
--- a/modules/core/src/intel_gpu_gemm.inl.hpp
+++ b/modules/core/src/intel_gpu_gemm.inl.hpp
@@ -25,7 +25,6 @@
 #ifdef HAVE_OPENCL
 
 #include <sstream>
-#include "precomp.hpp"
 #include "opencl_kernels_core.hpp"
 #include "opencv2/core/opencl/runtime/opencl_clamdblas.hpp"
 #include "opencv2/core/opencl/runtime/opencl_core.hpp"

diff --git a/modules/core/src/matrix_c.cpp b/modules/core/src/matrix_c.cpp
index 1c3e58857cb40470ff4c4779fb7f613c4a200e37..2fead4100c4bab2e0e3d058783823cd6d11d2c1d 100644 (file)
--- a/modules/core/src/matrix_c.cpp
+++ b/modules/core/src/matrix_c.cpp
@@ -1,6 +1,10 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+
+#include "precomp.hpp"
 #include "opencv2/core/mat.hpp"
 #include "opencv2/core/types_c.h"
-#include "precomp.hpp"
 
 // glue
 

diff --git a/modules/core/src/matrix_iterator.cpp b/modules/core/src/matrix_iterator.cpp
index aaa7f4aa0148720a2f6a11bc2abe6a20639d6b50..ce7c191cbeece1fde9c5a68f84f380eea217a5fe 100644 (file)
--- a/modules/core/src/matrix_iterator.cpp
+++ b/modules/core/src/matrix_iterator.cpp
@@ -2,9 +2,8 @@
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html
 
-
-#include "opencv2/core/mat.hpp"
 #include "precomp.hpp"
+#include "opencv2/core/mat.hpp"
 
 namespace cv {
 

diff --git a/modules/core/src/matrix_operations.cpp b/modules/core/src/matrix_operations.cpp
index 22ed50cf190ca8a7edfa4d9a4014d318f2bd7d66..6f863b887173638fd17e25ec88e1caa3c3cca453 100644 (file)
--- a/modules/core/src/matrix_operations.cpp
+++ b/modules/core/src/matrix_operations.cpp
@@ -2,11 +2,10 @@
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html
 
-
+#include "precomp.hpp"
 #include "opencv2/core/mat.hpp"
 #include "opencv2/core/types_c.h"
 #include "opencl_kernels_core.hpp"
-#include "precomp.hpp"
 
 #undef HAVE_IPP
 #undef CV_IPP_RUN_FAST

diff --git a/modules/core/src/matrix_sparse.cpp b/modules/core/src/matrix_sparse.cpp
index 05d16d706e817faa4ccacd960d2fe8c0adccc1e5..21e7e91151ae01573f0dd7ec6feed5f7656ad5b8 100644 (file)
--- a/modules/core/src/matrix_sparse.cpp
+++ b/modules/core/src/matrix_sparse.cpp
@@ -2,10 +2,9 @@
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html
 
-
+#include "precomp.hpp"
 #include "opencv2/core/mat.hpp"
 #include "opencv2/core/types_c.h"
-#include "precomp.hpp"
 
 namespace cv {
 

diff --git a/modules/core/src/matrix_wrap.cpp b/modules/core/src/matrix_wrap.cpp
index f0b5b895c4bb7969c41c3be2c2ef21d65826276c..ad697d204cf57a947236ea6c4d34c82a59aa6c14 100644 (file)
--- a/modules/core/src/matrix_wrap.cpp
+++ b/modules/core/src/matrix_wrap.cpp
@@ -2,9 +2,8 @@
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html
 
-
-#include "opencv2/core/mat.hpp"
 #include "precomp.hpp"
+#include "opencv2/core/mat.hpp"
 
 namespace cv {