From 6d3502833f85f0ea97817942498fe662abdf7175 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 16 Feb 2021 10:06:31 +0000 Subject: [PATCH] core: include version.hpp in cvdef.h, fix precomp.hpp usage --- modules/core/include/opencv2/core.hpp | 1 - modules/core/include/opencv2/core/cvdef.h | 2 ++ modules/core/include/opencv2/core/simd_intrinsics.hpp | 1 - modules/core/src/hal_internal.cpp | 1 + modules/core/src/hal_internal.hpp | 2 -- modules/core/src/intel_gpu_gemm.inl.hpp | 1 - modules/core/src/matrix_c.cpp | 6 +++++- modules/core/src/matrix_iterator.cpp | 3 +-- modules/core/src/matrix_operations.cpp | 3 +-- modules/core/src/matrix_sparse.cpp | 3 +-- modules/core/src/matrix_wrap.cpp | 3 +-- 11 files changed, 12 insertions(+), 14 deletions(-) diff --git a/modules/core/include/opencv2/core.hpp b/modules/core/include/opencv2/core.hpp index fc2432dcdf..be0a3a0dc5 100644 --- 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 6488b8bd4f..38f9eed452 100644 --- 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 7151d36073..309202d123 100644 --- 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 60f96c0164..483281d1f7 100644 --- 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 129a710145..c7a0d46de4 100644 --- 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 729b43f604..fbd567b949 100644 --- 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 -#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 1c3e58857c..2fead4100c 100644 --- 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 aaa7f4aa01..ce7c191cbe 100644 --- 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 22ed50cf19..6f863b8871 100644 --- 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 05d16d706e..21e7e91151 100644 --- 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 f0b5b895c4..ad697d204c 100644 --- 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 {