From 77aafc2984af7ed2e2ccc5968548dffe5a1740d7 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Wed, 17 Apr 2013 17:54:21 +0400 Subject: [PATCH] removed unused includes --- modules/gpu/include/opencv2/gpu.hpp | 103 +----------------------------------- modules/gpu/perf/perf_precomp.hpp | 11 ---- modules/gpu/perf4au/main.cpp | 9 +--- modules/gpu/src/precomp.hpp | 35 ------------ modules/gpu/test/test_precomp.hpp | 22 +------- 5 files changed, 5 insertions(+), 175 deletions(-) diff --git a/modules/gpu/include/opencv2/gpu.hpp b/modules/gpu/include/opencv2/gpu.hpp index d613586..e2f7478 100644 --- a/modules/gpu/include/opencv2/gpu.hpp +++ b/modules/gpu/include/opencv2/gpu.hpp @@ -43,12 +43,6 @@ #ifndef __OPENCV_GPU_HPP__ #define __OPENCV_GPU_HPP__ -#ifndef SKIP_INCLUDES -#include -#include -#include -#endif - #include "opencv2/core/gpumat.hpp" #include "opencv2/gpuarithm.hpp" #include "opencv2/gpufilters.hpp" @@ -58,100 +52,7 @@ #include "opencv2/gpucalib3d.hpp" #include "opencv2/gpuobjdetect.hpp" -#include "opencv2/imgproc.hpp" -#include "opencv2/objdetect.hpp" -#include "opencv2/features2d.hpp" - namespace cv { namespace gpu { -////////////////////////////// Image processing ////////////////////////////// - - - - -///////////////////////////// Calibration 3D ////////////////////////////////// - -//////////////////////////////// Image Labeling //////////////////////////////// - - - -////////////////////////////////// Histograms ////////////////////////////////// - - - -//////////////////////////////// StereoBM_GPU //////////////////////////////// - - - -////////////////////////// StereoBeliefPropagation /////////////////////////// - - -/////////////////////////// StereoConstantSpaceBP /////////////////////////// - - - -/////////////////////////// DisparityBilateralFilter /////////////////////////// - - - - - - -////////////////////////////////// BruteForceMatcher ////////////////////////////////// - - - -template -class CV_EXPORTS BruteForceMatcher_GPU; - -template -class CV_EXPORTS BruteForceMatcher_GPU< L1 > : public BFMatcher_GPU -{ -public: - explicit BruteForceMatcher_GPU() : BFMatcher_GPU(NORM_L1) {} - explicit BruteForceMatcher_GPU(L1 /*d*/) : BFMatcher_GPU(NORM_L1) {} -}; -template -class CV_EXPORTS BruteForceMatcher_GPU< L2 > : public BFMatcher_GPU -{ -public: - explicit BruteForceMatcher_GPU() : BFMatcher_GPU(NORM_L2) {} - explicit BruteForceMatcher_GPU(L2 /*d*/) : BFMatcher_GPU(NORM_L2) {} -}; -template <> class CV_EXPORTS BruteForceMatcher_GPU< Hamming > : public BFMatcher_GPU -{ -public: - explicit BruteForceMatcher_GPU() : BFMatcher_GPU(NORM_HAMMING) {} - explicit BruteForceMatcher_GPU(Hamming /*d*/) : BFMatcher_GPU(NORM_HAMMING) {} -}; - -////////////////////////////////// CascadeClassifier_GPU ////////////////////////////////////////// - - -////////////////////////////////// FAST ////////////////////////////////////////// - - - -////////////////////////////////// ORB ////////////////////////////////////////// - - - - - - - - - - - - - - - - - - - - //! removes points (CV_32FC2, single row matrix) with zero mask value CV_EXPORTS void compactPoints(GpuMat &points0, GpuMat &points1, const GpuMat &mask); @@ -160,8 +61,6 @@ CV_EXPORTS void calcWobbleSuppressionMaps( int left, int idx, int right, Size size, const Mat &ml, const Mat &mr, GpuMat &mapx, GpuMat &mapy); -} // namespace gpu - -} // namespace cv +}} // namespace cv { namespace gpu { #endif /* __OPENCV_GPU_HPP__ */ diff --git a/modules/gpu/perf/perf_precomp.hpp b/modules/gpu/perf/perf_precomp.hpp index f365a5a..9c75581 100644 --- a/modules/gpu/perf/perf_precomp.hpp +++ b/modules/gpu/perf/perf_precomp.hpp @@ -51,21 +51,10 @@ #ifndef __OPENCV_PERF_PRECOMP_HPP__ #define __OPENCV_PERF_PRECOMP_HPP__ -#include -#include - #include "opencv2/ts.hpp" #include "opencv2/ts/gpu_perf.hpp" -#include "opencv2/core.hpp" -#include "opencv2/highgui.hpp" #include "opencv2/gpu.hpp" -#include "opencv2/calib3d.hpp" -#include "opencv2/imgproc.hpp" -#include "opencv2/video.hpp" -#include "opencv2/photo.hpp" - -#include "opencv2/core/gpu_private.hpp" #ifdef GTEST_CREATE_SHARED_LIBRARY #error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined diff --git a/modules/gpu/perf4au/main.cpp b/modules/gpu/perf4au/main.cpp index 47a6c4e..30e63d5 100644 --- a/modules/gpu/perf4au/main.cpp +++ b/modules/gpu/perf4au/main.cpp @@ -40,18 +40,13 @@ // //M*/ -#include +#include "opencv2/ts.hpp" +#include "opencv2/ts/gpu_perf.hpp" -#ifdef HAVE_CVCONFIG_H -#include "cvconfig.h" -#endif -#include "opencv2/core.hpp" #include "opencv2/gpu.hpp" #include "opencv2/highgui.hpp" #include "opencv2/video.hpp" #include "opencv2/legacy.hpp" -#include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_perf.hpp" int main(int argc, char* argv[]) { diff --git a/modules/gpu/src/precomp.hpp b/modules/gpu/src/precomp.hpp index 0127bd2..1b5207b 100644 --- a/modules/gpu/src/precomp.hpp +++ b/modules/gpu/src/precomp.hpp @@ -43,43 +43,8 @@ #ifndef __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__ -#if defined _MSC_VER && _MSC_VER >= 1200 - #pragma warning( disable: 4251 4710 4711 4514 4996 ) -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "opencv2/core.hpp" -#include "opencv2/core/utility.hpp" #include "opencv2/gpu.hpp" -#include "opencv2/imgproc.hpp" -#include "opencv2/calib3d.hpp" -#include "opencv2/video.hpp" -#include "opencv2/core/private.hpp" #include "opencv2/core/gpu_private.hpp" -#ifdef HAVE_CUDA - #ifdef HAVE_CUFFT - #include - #endif - - #include "internal_shared.hpp" - #include "opencv2/core/stream_accessor.hpp" - - #include "opencv2/gpunvidia.hpp" -#endif /* defined(HAVE_CUDA) */ - #endif /* __OPENCV_PRECOMP_H__ */ diff --git a/modules/gpu/test/test_precomp.hpp b/modules/gpu/test/test_precomp.hpp index f98f364..1e42481 100644 --- a/modules/gpu/test/test_precomp.hpp +++ b/modules/gpu/test/test_precomp.hpp @@ -51,29 +51,11 @@ #ifndef __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "opencv2/ts.hpp" +#include "opencv2/ts/gpu_test.hpp" #include "opencv2/core.hpp" #include "opencv2/core/opengl.hpp" -#include "opencv2/highgui.hpp" -#include "opencv2/calib3d.hpp" -#include "opencv2/imgproc.hpp" -#include "opencv2/video.hpp" -#include "opencv2/ts.hpp" -#include "opencv2/ts/gpu_test.hpp" #include "opencv2/gpu.hpp" -#include "opencv2/core/gpu_private.hpp" - #endif -- 2.7.4