From 23768b18265623d1c6e908c6196b33e3cbfa1b65 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Sat, 21 May 2011 18:32:34 +0000 Subject: [PATCH] replaced #include with #include "some_opencv_hdr" (ticket #719) --- modules/calib3d/src/circlesgrid.cpp | 2 +- modules/calib3d/src/precomp.hpp | 2 +- modules/contrib/src/precomp.hpp | 6 +----- modules/core/src/precomp.hpp | 2 +- modules/features2d/src/blobdetector.cpp | 2 +- modules/features2d/src/precomp.hpp | 2 +- modules/gpu/src/precomp.hpp | 2 +- modules/gpu/test/test_precomp.hpp | 2 +- modules/haartraining/_cvcommon.h | 6 +++--- modules/haartraining/cvclassifier.h | 2 +- modules/haartraining/cvhaartraining.cpp | 2 +- modules/haartraining/cvsamples.cpp | 4 ++-- modules/haartraining/performance.cpp | 4 ++-- modules/imgproc/src/precomp.hpp | 2 +- modules/legacy/src/precomp.hpp | 2 +- modules/ml/src/precomp.hpp | 2 +- modules/objdetect/src/precomp.hpp | 2 +- .../objdetect/test/test_latentsvmdetector.cpp | 2 +- modules/python/src1/cv.cpp | 10 +++++----- modules/stitching/autocalib.hpp | 2 +- modules/stitching/blenders.cpp | 4 ++-- modules/stitching/blenders.hpp | 2 +- modules/stitching/main.cpp | 4 ++-- modules/stitching/matchers.cpp | 16 ++++++++-------- modules/stitching/matchers.hpp | 16 ++++++++-------- modules/stitching/motion_estimators.cpp | 8 ++++---- modules/stitching/motion_estimators.hpp | 2 +- modules/stitching/seam_finders.cpp | 2 +- modules/stitching/seam_finders.hpp | 2 +- modules/stitching/util.hpp | 2 +- modules/stitching/warpers.hpp | 4 ++-- modules/traincascade/imagestorage.h | 2 +- modules/video/src/precomp.hpp | 2 +- samples/c/adaptiveskindetector.cpp | 6 +++--- samples/c/bgfg_codebook.cpp | 6 +++--- samples/c/blobtrack_sample.cpp | 6 +++--- samples/c/contours.c | 2 +- samples/c/convert_cascade.c | 4 ++-- samples/c/delaunay.c | 2 +- samples/c/facedetect.cpp | 8 ++++---- samples/c/fback_c.c | 4 ++-- samples/c/find_obj.cpp | 10 +++++----- samples/c/latentsvmdetect.cpp | 2 +- samples/c/mser_sample.cpp | 2 +- samples/c/one_way_sample.cpp | 2 +- samples/cpp/bgfg_segm.cpp | 4 ++-- samples/cpp/brief_match_test.cpp | 8 ++++---- samples/cpp/build3dmodel.cpp | 10 +++++----- samples/cpp/calibration_artificial.cpp | 6 +++--- samples/cpp/camshiftdemo.cpp | 6 +++--- samples/cpp/chamfer.cpp | 6 +++--- samples/cpp/connected_components.cpp | 4 ++-- samples/cpp/contours2.cpp | 4 ++-- samples/cpp/convexhull.cpp | 4 ++-- samples/cpp/demhist.cpp | 4 ++-- samples/cpp/dft.cpp | 6 +++--- samples/cpp/distrans.cpp | 4 ++-- samples/cpp/dot.cpp | 6 +++--- samples/cpp/drawing.cpp | 4 ++-- samples/cpp/edge.cpp | 4 ++-- samples/cpp/fback.cpp | 6 +++--- samples/cpp/ffilldemo.cpp | 4 ++-- samples/cpp/image.cpp | 2 +- samples/cpp/matcher_simple.cpp | 6 +++--- samples/cpp/morphology2.cpp | 4 ++-- samples/cpp/multicascadeclassifier.cpp | 6 +++--- samples/cpp/segment_objects.cpp | 6 +++--- samples/cpp/select3dobj.cpp | 8 ++++---- samples/cpp/starter_imagelist.cpp | 2 +- samples/cpp/starter_video.cpp | 2 +- samples/cpp/video_homography.cpp | 8 ++++---- samples/gpu/cascadeclassifier.cpp | 10 +++++----- samples/gpu/cascadeclassifier_nvidia_api.cpp | 4 ++-- samples/gpu/driver_api_multi.cpp | 6 +++--- samples/gpu/driver_api_stereo_multi.cpp | 8 ++++---- samples/gpu/morfology.cpp | 6 +++--- samples/gpu/multi.cpp | 6 +++--- samples/gpu/performance/performance.h | 2 +- samples/gpu/performance/tests.cpp | 8 ++++---- samples/gpu/stereo_multi.cpp | 8 ++++---- samples/gpu/surf_keypoint_matcher.cpp | 8 ++++---- 81 files changed, 188 insertions(+), 192 deletions(-) diff --git a/modules/calib3d/src/circlesgrid.cpp b/modules/calib3d/src/circlesgrid.cpp index b7b80c5d01..635476dc4c 100644 --- a/modules/calib3d/src/circlesgrid.cpp +++ b/modules/calib3d/src/circlesgrid.cpp @@ -44,7 +44,7 @@ //#define DEBUG_CIRCLES #ifdef DEBUG_CIRCLES -#include +#include "opencv2/highgui/highgui.hpp" #endif using namespace cv; diff --git a/modules/calib3d/src/precomp.hpp b/modules/calib3d/src/precomp.hpp index fc5a72cc71..07e769c138 100644 --- a/modules/calib3d/src/precomp.hpp +++ b/modules/calib3d/src/precomp.hpp @@ -47,7 +47,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #include "opencv2/calib3d/calib3d.hpp" diff --git a/modules/contrib/src/precomp.hpp b/modules/contrib/src/precomp.hpp index 41555db76f..2891cb1fe2 100644 --- a/modules/contrib/src/precomp.hpp +++ b/modules/contrib/src/precomp.hpp @@ -48,11 +48,7 @@ #endif #ifdef HAVE_CONFIG_H -#include -#endif - -#ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #include "opencv2/contrib/contrib.hpp" diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp index 24c81ace60..4eb5e25bef 100644 --- a/modules/core/src/precomp.hpp +++ b/modules/core/src/precomp.hpp @@ -49,7 +49,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #include "opencv2/core/core.hpp" diff --git a/modules/features2d/src/blobdetector.cpp b/modules/features2d/src/blobdetector.cpp index 9a66a56373..5b6b152a5b 100644 --- a/modules/features2d/src/blobdetector.cpp +++ b/modules/features2d/src/blobdetector.cpp @@ -46,7 +46,7 @@ //#define DEBUG_BLOB_DETECTOR #ifdef DEBUG_BLOB_DETECTOR -#include +#include "opencv2/highgui/highgui.hpp" #endif using namespace cv; diff --git a/modules/features2d/src/precomp.hpp b/modules/features2d/src/precomp.hpp index 0361918504..a04a12b6c7 100644 --- a/modules/features2d/src/precomp.hpp +++ b/modules/features2d/src/precomp.hpp @@ -48,7 +48,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #include "opencv2/features2d/features2d.hpp" diff --git a/modules/gpu/src/precomp.hpp b/modules/gpu/src/precomp.hpp index 35fc6b9795..7a5441b6f2 100644 --- a/modules/gpu/src/precomp.hpp +++ b/modules/gpu/src/precomp.hpp @@ -47,7 +47,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #include diff --git a/modules/gpu/test/test_precomp.hpp b/modules/gpu/test/test_precomp.hpp index 9df4698b75..f114994f7a 100644 --- a/modules/gpu/test/test_precomp.hpp +++ b/modules/gpu/test/test_precomp.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include "cvconfig.h" #include "opencv2/core/core.hpp" #include "opencv2/highgui/highgui.hpp" #include "opencv2/calib3d/calib3d.hpp" diff --git a/modules/haartraining/_cvcommon.h b/modules/haartraining/_cvcommon.h index e2f66b99aa..688e3b2ec4 100644 --- a/modules/haartraining/_cvcommon.h +++ b/modules/haartraining/_cvcommon.h @@ -42,9 +42,9 @@ #ifndef __CVCOMMON_H_ #define __CVCOMMON_H_ -#include -#include -#include +#include "cxcore.h" +#include "cv.h" +#include "cxmisc.h" #define __BEGIN__ __CV_BEGIN__ #define __END__ __CV_END__ diff --git a/modules/haartraining/cvclassifier.h b/modules/haartraining/cvclassifier.h index 76725fcbdb..3fc2942cc7 100644 --- a/modules/haartraining/cvclassifier.h +++ b/modules/haartraining/cvclassifier.h @@ -49,7 +49,7 @@ #define _CVCLASSIFIER_H_ #include -#include +#include "cxcore.h" #define CV_BOOST_API diff --git a/modules/haartraining/cvhaartraining.cpp b/modules/haartraining/cvhaartraining.cpp index 2bb90adaa2..f21f51e761 100644 --- a/modules/haartraining/cvhaartraining.cpp +++ b/modules/haartraining/cvhaartraining.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include "highgui.h" #ifdef CV_VERBOSE #include diff --git a/modules/haartraining/cvsamples.cpp b/modules/haartraining/cvsamples.cpp index ebc9ca7acf..39313ecaa5 100644 --- a/modules/haartraining/cvsamples.cpp +++ b/modules/haartraining/cvsamples.cpp @@ -54,8 +54,8 @@ //#include -#include -#include +#include "cv.h" +#include "highgui.h" /* Calculates coefficients of perspective transformation * which maps into rectangle ((0,0), (w,0), (w,h), (h,0)): diff --git a/modules/haartraining/performance.cpp b/modules/haartraining/performance.cpp index 2ccea9bde9..c14e41c539 100644 --- a/modules/haartraining/performance.cpp +++ b/modules/haartraining/performance.cpp @@ -44,8 +44,8 @@ * * Measure performance of classifier */ -#include -#include +#include "cv.h" +#include "highgui.h" #include #include diff --git a/modules/imgproc/src/precomp.hpp b/modules/imgproc/src/precomp.hpp index 32f825bb7a..2c1c596b0e 100644 --- a/modules/imgproc/src/precomp.hpp +++ b/modules/imgproc/src/precomp.hpp @@ -49,7 +49,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #include "opencv2/imgproc/imgproc.hpp" diff --git a/modules/legacy/src/precomp.hpp b/modules/legacy/src/precomp.hpp index be47ff10c2..cbfe06001b 100644 --- a/modules/legacy/src/precomp.hpp +++ b/modules/legacy/src/precomp.hpp @@ -46,7 +46,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #include "opencv2/legacy/legacy.hpp" diff --git a/modules/ml/src/precomp.hpp b/modules/ml/src/precomp.hpp index 7868d0c0b6..821cefa2a2 100644 --- a/modules/ml/src/precomp.hpp +++ b/modules/ml/src/precomp.hpp @@ -46,7 +46,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #include "opencv2/ml/ml.hpp" diff --git a/modules/objdetect/src/precomp.hpp b/modules/objdetect/src/precomp.hpp index f3d70639d9..e44632b349 100644 --- a/modules/objdetect/src/precomp.hpp +++ b/modules/objdetect/src/precomp.hpp @@ -48,7 +48,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #include "opencv2/objdetect/objdetect.hpp" diff --git a/modules/objdetect/test/test_latentsvmdetector.cpp b/modules/objdetect/test/test_latentsvmdetector.cpp index ac85d553b5..c82432fb2a 100644 --- a/modules/objdetect/test/test_latentsvmdetector.cpp +++ b/modules/objdetect/test/test_latentsvmdetector.cpp @@ -45,7 +45,7 @@ #include #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #ifdef HAVE_TBB diff --git a/modules/python/src1/cv.cpp b/modules/python/src1/cv.cpp index 298a75c5d9..3ed49e4226 100644 --- a/modules/python/src1/cv.cpp +++ b/modules/python/src1/cv.cpp @@ -2,11 +2,11 @@ #include -#include -#include -#include -#include -#include +#include "opencv/cxcore.h" +#include "opencv/cv.h" +#include "opencv/cvaux.h" +#include "opencv/cvwimage.h" +#include "opencv/highgui.h" #define MODULESTR "cv" diff --git a/modules/stitching/autocalib.hpp b/modules/stitching/autocalib.hpp index 6c985707c5..af7bc495c5 100644 --- a/modules/stitching/autocalib.hpp +++ b/modules/stitching/autocalib.hpp @@ -2,7 +2,7 @@ #define __OPENCV_AUTOCALIB_HPP__ #include -#include +#include "opencv2/core/core.hpp" #include "matchers.hpp" // See "Construction of Panoramic Image Mosaics with Global and Local Alignment" diff --git a/modules/stitching/blenders.cpp b/modules/stitching/blenders.cpp index ae95ad108e..d82c08a216 100644 --- a/modules/stitching/blenders.cpp +++ b/modules/stitching/blenders.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include "blenders.hpp" #include "util.hpp" diff --git a/modules/stitching/blenders.hpp b/modules/stitching/blenders.hpp index d471ee966b..b948a350cc 100644 --- a/modules/stitching/blenders.hpp +++ b/modules/stitching/blenders.hpp @@ -2,7 +2,7 @@ #define __OPENCV_BLENDERS_HPP__ #include -#include +#include "opencv2/core/core.hpp" // Simple blender which puts one image over another class Blender diff --git a/modules/stitching/main.cpp b/modules/stitching/main.cpp index 78bcfbb4d1..d5ea7dd5c0 100644 --- a/modules/stitching/main.cpp +++ b/modules/stitching/main.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/highgui/highgui.hpp" #include "util.hpp" #include "warpers.hpp" #include "blenders.hpp" diff --git a/modules/stitching/matchers.cpp b/modules/stitching/matchers.cpp index c5c1cdd057..25e253d2ce 100644 --- a/modules/stitching/matchers.cpp +++ b/modules/stitching/matchers.cpp @@ -1,8 +1,8 @@ #include #include -#include -#include -#include +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/calib3d/calib3d.hpp" +#include "opencv2/gpu/gpu.hpp" #include "matchers.hpp" #include "util.hpp" @@ -20,11 +20,11 @@ void FeaturesFinder::operator ()(const Mat &image, ImageFeatures &features) // Calculate histogram Mat hsv; cvtColor(image, hsv, CV_BGR2HSV); - int hbins = 30, sbins = 32, vbins = 30; - int hist_size[] = { hbins, sbins, vbins }; - float hranges[] = { 0, 180 }; - float sranges[] = { 0, 256 }; - float vranges[] = { 0, 256 }; + int hbins = 30, sbins = 32, vbins = 30; + int hist_size[] = { hbins, sbins, vbins }; + float hranges[] = { 0, 180 }; + float sranges[] = { 0, 256 }; + float vranges[] = { 0, 256 }; const float* ranges[] = { hranges, sranges, vranges }; int channels[] = { 0, 1, 2 }; calcHist(&hsv, 1, channels, Mat(), features.hist, 3, hist_size, ranges); diff --git a/modules/stitching/matchers.hpp b/modules/stitching/matchers.hpp index 317e882e6f..780be56be0 100644 --- a/modules/stitching/matchers.hpp +++ b/modules/stitching/matchers.hpp @@ -1,10 +1,10 @@ -#ifndef __OPENCV_MATCHERS_HPP__ -#define __OPENCV_MATCHERS_HPP__ - +#ifndef __OPENCV_MATCHERS_HPP__ +#define __OPENCV_MATCHERS_HPP__ + #include -#include -#include - +#include "opencv2/core/core.hpp" +#include "opencv2/features2d/features2d.hpp" + struct ImageFeatures { cv::Size img_size; @@ -79,6 +79,6 @@ protected: int num_matches_thresh2_; cv::Ptr impl_; -}; - +}; + #endif // __OPENCV_MATCHERS_HPP__ \ No newline at end of file diff --git a/modules/stitching/motion_estimators.cpp b/modules/stitching/motion_estimators.cpp index 9be37f928d..73b5917627 100644 --- a/modules/stitching/motion_estimators.cpp +++ b/modules/stitching/motion_estimators.cpp @@ -1,6 +1,6 @@ #include #include "opencv2/core/core_c.h" -#include +#include "opencv2/calib3d/calib3d.hpp" #include "autocalib.hpp" #include "motion_estimators.hpp" #include "util.hpp" @@ -116,9 +116,9 @@ void BundleAdjuster::estimate(const vector &features, const vecto for (int i = 0; i < num_images_ - 1; ++i) { for (int j = i + 1; j < num_images_; ++j) - { - const MatchesInfo& matches_info = pairwise_matches_[i * num_images_ + j]; - if (matches_info.confidence > conf_thresh_) + { + const MatchesInfo& matches_info = pairwise_matches_[i * num_images_ + j]; + if (matches_info.confidence > conf_thresh_) edges_.push_back(make_pair(i, j)); } } diff --git a/modules/stitching/motion_estimators.hpp b/modules/stitching/motion_estimators.hpp index 88a860faea..49bdac34dd 100644 --- a/modules/stitching/motion_estimators.hpp +++ b/modules/stitching/motion_estimators.hpp @@ -2,7 +2,7 @@ #define __OPENCV_MOTION_ESTIMATORS_HPP__ #include -#include +#include "opencv2/core/core.hpp" #include "matchers.hpp" #include "util.hpp" diff --git a/modules/stitching/seam_finders.cpp b/modules/stitching/seam_finders.cpp index 1195c832d1..410bc95b6a 100644 --- a/modules/stitching/seam_finders.cpp +++ b/modules/stitching/seam_finders.cpp @@ -1,4 +1,4 @@ -#include +#include "opencv2/imgproc/imgproc.hpp" #include #include "seam_finders.hpp" #include "util.hpp" diff --git a/modules/stitching/seam_finders.hpp b/modules/stitching/seam_finders.hpp index cc4f76f3ee..2afe15d4b6 100644 --- a/modules/stitching/seam_finders.hpp +++ b/modules/stitching/seam_finders.hpp @@ -2,7 +2,7 @@ #define __OPENCV_SEAM_FINDERS_HPP__ #include -#include +#include "opencv2/core/core.hpp" class SeamFinder { diff --git a/modules/stitching/util.hpp b/modules/stitching/util.hpp index 52ac6e4272..680d5113fd 100644 --- a/modules/stitching/util.hpp +++ b/modules/stitching/util.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include "opencv2/core/core.hpp" #define ENABLE_LOG 1 diff --git a/modules/stitching/warpers.hpp b/modules/stitching/warpers.hpp index a839b6c03b..df853c9098 100644 --- a/modules/stitching/warpers.hpp +++ b/modules/stitching/warpers.hpp @@ -1,8 +1,8 @@ #ifndef __OPENCV_WARPERS_HPP__ #define __OPENCV_WARPERS_HPP__ -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/imgproc/imgproc.hpp" class Warper { diff --git a/modules/traincascade/imagestorage.h b/modules/traincascade/imagestorage.h index 047e32b8d8..91a4e5e87f 100644 --- a/modules/traincascade/imagestorage.h +++ b/modules/traincascade/imagestorage.h @@ -1,7 +1,7 @@ #ifndef _OPENCV_IMAGESTORAGE_H_ #define _OPENCV_IMAGESTORAGE_H_ -#include +#include "highgui.h" using namespace cv; diff --git a/modules/video/src/precomp.hpp b/modules/video/src/precomp.hpp index 98c10e8cd4..98e3c4df26 100644 --- a/modules/video/src/precomp.hpp +++ b/modules/video/src/precomp.hpp @@ -48,7 +48,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #include "opencv2/video/tracking.hpp" diff --git a/samples/c/adaptiveskindetector.cpp b/samples/c/adaptiveskindetector.cpp index 90e4d068f9..231eb4ca38 100644 --- a/samples/c/adaptiveskindetector.cpp +++ b/samples/c/adaptiveskindetector.cpp @@ -35,9 +35,9 @@ //M*/ -#include -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/contrib/contrib.hpp" +#include "opencv2/highgui/highgui.hpp" #include #include diff --git a/samples/c/bgfg_codebook.cpp b/samples/c/bgfg_codebook.cpp index 6bbbb8084b..6460aa7f87 100644 --- a/samples/c/bgfg_codebook.cpp +++ b/samples/c/bgfg_codebook.cpp @@ -25,10 +25,10 @@ #include #include -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/video/background_segm.hpp" #include -#include +#include "opencv2/highgui/highgui.hpp" using namespace std; using namespace cv; diff --git a/samples/c/blobtrack_sample.cpp b/samples/c/blobtrack_sample.cpp index 34110cb7ca..78c8328ba1 100644 --- a/samples/c/blobtrack_sample.cpp +++ b/samples/c/blobtrack_sample.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "opencv2/video/background_segm.hpp" +#include "opencv2/legacy/blobtrack.hpp" +#include "opencv2/highgui/highgui.hpp" #include #include diff --git a/samples/c/contours.c b/samples/c/contours.c index 2393698e29..299928005d 100644 --- a/samples/c/contours.c +++ b/samples/c/contours.c @@ -1,5 +1,5 @@ #include -#include +#include "opencv2/highgui/highgui.hpp" #include void help() { diff --git a/samples/c/convert_cascade.c b/samples/c/convert_cascade.c index 4d03d35b37..a00eb5f017 100644 --- a/samples/c/convert_cascade.c +++ b/samples/c/convert_cascade.c @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/objdetect/objdetect.hpp" +#include "opencv2/highgui/highgui.hpp" #include #include diff --git a/samples/c/delaunay.c b/samples/c/delaunay.c index 0d8f3e2c13..8eed46e91d 100644 --- a/samples/c/delaunay.c +++ b/samples/c/delaunay.c @@ -1,5 +1,5 @@ #include -#include +#include "opencv2/highgui/highgui.hpp" #include void help() diff --git a/samples/c/facedetect.cpp b/samples/c/facedetect.cpp index 29dae0c780..4dcef029a5 100644 --- a/samples/c/facedetect.cpp +++ b/samples/c/facedetect.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/objdetect/objdetect.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/imgproc/imgproc.hpp" #include #include diff --git a/samples/c/fback_c.c b/samples/c/fback_c.c index 6a798e220a..1be1325075 100644 --- a/samples/c/fback_c.c +++ b/samples/c/fback_c.c @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/video/tracking.hpp" +#include "opencv2/highgui/highgui.hpp" #include void help() { diff --git a/samples/c/find_obj.cpp b/samples/c/find_obj.cpp index 3db381a85f..63f15df11e 100644 --- a/samples/c/find_obj.cpp +++ b/samples/c/find_obj.cpp @@ -4,11 +4,11 @@ * Author: Liu Liu * liuliu.1987+opencv@gmail.com */ -#include -#include -#include -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/objdetect/objdetect.hpp" +#include "opencv2/features2d/features2d.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/calib3d/calib3d.hpp" #include #include diff --git a/samples/c/latentsvmdetect.cpp b/samples/c/latentsvmdetect.cpp index 2361ec234e..f1e25b4e9f 100644 --- a/samples/c/latentsvmdetect.cpp +++ b/samples/c/latentsvmdetect.cpp @@ -5,7 +5,7 @@ #include #ifdef HAVE_CONFIG_H -#include +#include "cvconfig.h" #endif #ifdef HAVE_TBB #include "tbb/task_scheduler_init.h" diff --git a/samples/c/mser_sample.cpp b/samples/c/mser_sample.cpp index 5b830044ed..5411c9954b 100644 --- a/samples/c/mser_sample.cpp +++ b/samples/c/mser_sample.cpp @@ -2,7 +2,7 @@ * Copyright� 2009, Liu Liu All rights reserved. */ -#include +#include "opencv2/core/core.hpp" #include "opencv2/highgui/highgui.hpp" #include "opencv2/features2d/features2d.hpp" #include "opencv2/imgproc/imgproc_c.h" diff --git a/samples/c/one_way_sample.cpp b/samples/c/one_way_sample.cpp index 9ef6ed2fef..39e9b7d136 100644 --- a/samples/c/one_way_sample.cpp +++ b/samples/c/one_way_sample.cpp @@ -7,7 +7,7 @@ * */ -#include +#include "opencv2/core/core.hpp" #include "opencv2/imgproc/imgproc.hpp" #include "opencv2/features2d/features2d.hpp" #include "opencv2/highgui/highgui.hpp" diff --git a/samples/cpp/bgfg_segm.cpp b/samples/cpp/bgfg_segm.cpp index 8eadfcff81..2beb409f68 100644 --- a/samples/cpp/bgfg_segm.cpp +++ b/samples/cpp/bgfg_segm.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/video/background_segm.hpp" +#include "opencv2/highgui/highgui.hpp" #include using namespace cv; diff --git a/samples/cpp/brief_match_test.cpp b/samples/cpp/brief_match_test.cpp index 35fd0a769a..5c491dac2c 100644 --- a/samples/cpp/brief_match_test.cpp +++ b/samples/cpp/brief_match_test.cpp @@ -4,10 +4,10 @@ * Created on: Oct 17, 2010 * Author: ethan */ -#include -#include -#include -#include +#include "opencv2/calib3d/calib3d.hpp" +#include "opencv2/features2d/features2d.hpp" +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include #include diff --git a/samples/cpp/build3dmodel.cpp b/samples/cpp/build3dmodel.cpp index 953d5adecf..b57ca0d292 100644 --- a/samples/cpp/build3dmodel.cpp +++ b/samples/cpp/build3dmodel.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/calib3d/calib3d.hpp" +#include "opencv2/features2d/features2d.hpp" +#include "opencv2/highgui/highgui.hpp" #include diff --git a/samples/cpp/calibration_artificial.cpp b/samples/cpp/calibration_artificial.cpp index 061d0627b1..6adb5bb187 100644 --- a/samples/cpp/calibration_artificial.cpp +++ b/samples/cpp/calibration_artificial.cpp @@ -3,9 +3,9 @@ #include #include -#include -#include -#include +#include "opencv2/calib3d/calib3d.hpp" +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" using namespace cv; using namespace std; diff --git a/samples/cpp/camshiftdemo.cpp b/samples/cpp/camshiftdemo.cpp index 93735bb388..5fcd2c664d 100644 --- a/samples/cpp/camshiftdemo.cpp +++ b/samples/cpp/camshiftdemo.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "opencv2/video/tracking.hpp" +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include #include diff --git a/samples/cpp/chamfer.cpp b/samples/cpp/chamfer.cpp index 1fe4366987..3d4b5c20ff 100644 --- a/samples/cpp/chamfer.cpp +++ b/samples/cpp/chamfer.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/contrib/contrib.hpp" #include diff --git a/samples/cpp/connected_components.cpp b/samples/cpp/connected_components.cpp index 81110d051b..01bff9c0a6 100644 --- a/samples/cpp/connected_components.cpp +++ b/samples/cpp/connected_components.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include using namespace cv; diff --git a/samples/cpp/contours2.cpp b/samples/cpp/contours2.cpp index 705c27da37..a717123b1d 100644 --- a/samples/cpp/contours2.cpp +++ b/samples/cpp/contours2.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include #include diff --git a/samples/cpp/convexhull.cpp b/samples/cpp/convexhull.cpp index f9eb91baee..c588289d73 100644 --- a/samples/cpp/convexhull.cpp +++ b/samples/cpp/convexhull.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include #include diff --git a/samples/cpp/demhist.cpp b/samples/cpp/demhist.cpp index ee9f1055ad..cf48c25e3a 100644 --- a/samples/cpp/demhist.cpp +++ b/samples/cpp/demhist.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include diff --git a/samples/cpp/dft.cpp b/samples/cpp/dft.cpp index d5984bd668..7d110ae04d 100644 --- a/samples/cpp/dft.cpp +++ b/samples/cpp/dft.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include using namespace cv; diff --git a/samples/cpp/distrans.cpp b/samples/cpp/distrans.cpp index 80003574a7..cae24f5db5 100644 --- a/samples/cpp/distrans.cpp +++ b/samples/cpp/distrans.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include diff --git a/samples/cpp/dot.cpp b/samples/cpp/dot.cpp index d1d3f30e78..6bc809a29f 100644 --- a/samples/cpp/dot.cpp +++ b/samples/cpp/dot.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/objdetect/objdetect.hpp" #include #include diff --git a/samples/cpp/drawing.cpp b/samples/cpp/drawing.cpp index b8be30ff6d..96dcce01e4 100644 --- a/samples/cpp/drawing.cpp +++ b/samples/cpp/drawing.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/highgui/highgui.hpp" #include using namespace cv; diff --git a/samples/cpp/edge.cpp b/samples/cpp/edge.cpp index 5f18cdc229..c30b086edf 100644 --- a/samples/cpp/edge.cpp +++ b/samples/cpp/edge.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include diff --git a/samples/cpp/fback.cpp b/samples/cpp/fback.cpp index 688d052057..bf88e16a8a 100644 --- a/samples/cpp/fback.cpp +++ b/samples/cpp/fback.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "opencv2/video/tracking.hpp" +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include diff --git a/samples/cpp/ffilldemo.cpp b/samples/cpp/ffilldemo.cpp index 4191a9b902..97304832de 100644 --- a/samples/cpp/ffilldemo.cpp +++ b/samples/cpp/ffilldemo.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include diff --git a/samples/cpp/image.cpp b/samples/cpp/image.cpp index 677e1bca8f..8d9e8174e1 100644 --- a/samples/cpp/image.cpp +++ b/samples/cpp/image.cpp @@ -3,7 +3,7 @@ #include "ml.h" #include #include -#include +#include "opencv2/flann/flann.hpp" using namespace cv; // all the new API is put into "cv" namespace. Export its content using namespace std; diff --git a/samples/cpp/matcher_simple.cpp b/samples/cpp/matcher_simple.cpp index 19ec7606dd..1f1ded6611 100644 --- a/samples/cpp/matcher_simple.cpp +++ b/samples/cpp/matcher_simple.cpp @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/features2d/features2d.hpp" +#include "opencv2/highgui/highgui.hpp" using namespace cv; diff --git a/samples/cpp/morphology2.cpp b/samples/cpp/morphology2.cpp index c69e259298..069584a7c8 100644 --- a/samples/cpp/morphology2.cpp +++ b/samples/cpp/morphology2.cpp @@ -1,7 +1,7 @@ #define CV_NO_BACKWARD_COMPATIBILITY -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" #include #include diff --git a/samples/cpp/multicascadeclassifier.cpp b/samples/cpp/multicascadeclassifier.cpp index 29fe7acd93..ece866b891 100644 --- a/samples/cpp/multicascadeclassifier.cpp +++ b/samples/cpp/multicascadeclassifier.cpp @@ -1,8 +1,8 @@ // WARNING: this sample is under construction! Use it on your own risk. -#include -#include -#include +#include "opencv2/objdetect/objdetect.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/imgproc/imgproc.hpp" #include #include diff --git a/samples/cpp/segment_objects.cpp b/samples/cpp/segment_objects.cpp index a7b1870974..8e14fcf321 100644 --- a/samples/cpp/segment_objects.cpp +++ b/samples/cpp/segment_objects.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/video/background_segm.hpp" #include #include diff --git a/samples/cpp/select3dobj.cpp b/samples/cpp/select3dobj.cpp index 3e9e41140e..b2d7f84e7c 100644 --- a/samples/cpp/select3dobj.cpp +++ b/samples/cpp/select3dobj.cpp @@ -8,10 +8,10 @@ * */ -#include -#include -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/calib3d/calib3d.hpp" +#include "opencv2/highgui/highgui.hpp" #include #include diff --git a/samples/cpp/starter_imagelist.cpp b/samples/cpp/starter_imagelist.cpp index a6f38bd281..02db83d703 100644 --- a/samples/cpp/starter_imagelist.cpp +++ b/samples/cpp/starter_imagelist.cpp @@ -8,7 +8,7 @@ * that was generated with imagelist_creator.cpp * easy as CV_PI right? */ -#include +#include "opencv2/highgui/highgui.hpp" #include #include diff --git a/samples/cpp/starter_video.cpp b/samples/cpp/starter_video.cpp index 68194cace0..9244ee5d93 100644 --- a/samples/cpp/starter_video.cpp +++ b/samples/cpp/starter_video.cpp @@ -7,7 +7,7 @@ * A starter sample for using opencv, get a video stream and display the images * easy as CV_PI right? */ -#include +#include "opencv2/highgui/highgui.hpp" #include #include #include diff --git a/samples/cpp/video_homography.cpp b/samples/cpp/video_homography.cpp index 9ff374b104..1f9c020202 100644 --- a/samples/cpp/video_homography.cpp +++ b/samples/cpp/video_homography.cpp @@ -5,10 +5,10 @@ * Author: erublee */ -#include -#include -#include -#include +#include "opencv2/calib3d/calib3d.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/features2d/features2d.hpp" #include #include #include diff --git a/samples/gpu/cascadeclassifier.cpp b/samples/gpu/cascadeclassifier.cpp index c9c806c8ba..848c2b12f6 100644 --- a/samples/gpu/cascadeclassifier.cpp +++ b/samples/gpu/cascadeclassifier.cpp @@ -4,11 +4,11 @@ #include "cvconfig.h" #include #include -#include -#include -#include -#include -#include +#include "opencv2/contrib/contrib.hpp" +#include "opencv2/objdetect/objdetect.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/gpu/gpu.hpp" using namespace std; using namespace cv; diff --git a/samples/gpu/cascadeclassifier_nvidia_api.cpp b/samples/gpu/cascadeclassifier_nvidia_api.cpp index 2faabb3f0f..3550c41169 100644 --- a/samples/gpu/cascadeclassifier_nvidia_api.cpp +++ b/samples/gpu/cascadeclassifier_nvidia_api.cpp @@ -3,8 +3,8 @@ #include "cvconfig.h" #include #include -#include -#include +#include "opencv2/opencv.hpp" +#include "opencv2/gpu/gpu.hpp" #ifdef HAVE_CUDA #include "NCVHaarObjectDetection.hpp" diff --git a/samples/gpu/driver_api_multi.cpp b/samples/gpu/driver_api_multi.cpp index 9c086608f2..ebcf088ccf 100644 --- a/samples/gpu/driver_api_multi.cpp +++ b/samples/gpu/driver_api_multi.cpp @@ -7,9 +7,9 @@ #endif #include -#include -#include -#include +#include "cvconfig.h" +#include "opencv2/core/core.hpp" +#include "opencv2/gpu/gpu.hpp" #if !defined(HAVE_CUDA) || !defined(HAVE_TBB) diff --git a/samples/gpu/driver_api_stereo_multi.cpp b/samples/gpu/driver_api_stereo_multi.cpp index b8d1807e29..9f65c4636a 100644 --- a/samples/gpu/driver_api_stereo_multi.cpp +++ b/samples/gpu/driver_api_stereo_multi.cpp @@ -8,10 +8,10 @@ #endif #include -#include -#include -#include -#include +#include "cvconfig.h" +#include "opencv2/core/core.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/gpu/gpu.hpp" #if !defined(HAVE_CUDA) || !defined(HAVE_TBB) diff --git a/samples/gpu/morfology.cpp b/samples/gpu/morfology.cpp index 2090592f42..8c544ed303 100644 --- a/samples/gpu/morfology.cpp +++ b/samples/gpu/morfology.cpp @@ -1,7 +1,7 @@ -#include -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/gpu/gpu.hpp" #include #include diff --git a/samples/gpu/multi.cpp b/samples/gpu/multi.cpp index da8bf758e8..242b186b39 100644 --- a/samples/gpu/multi.cpp +++ b/samples/gpu/multi.cpp @@ -7,9 +7,9 @@ #endif #include -#include -#include -#include +#include "cvconfig.h" +#include "opencv2/core/core.hpp" +#include "opencv2/gpu/gpu.hpp" #if !defined(HAVE_CUDA) || !defined(HAVE_TBB) diff --git a/samples/gpu/performance/performance.h b/samples/gpu/performance/performance.h index 2a39664b10..0031950475 100644 --- a/samples/gpu/performance/performance.h +++ b/samples/gpu/performance/performance.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include "opencv2/core/core.hpp" #define TAB " " diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp index aeee12d230..c7ef45bade 100644 --- a/samples/gpu/performance/tests.cpp +++ b/samples/gpu/performance/tests.cpp @@ -1,8 +1,8 @@ #include -#include -#include -#include -#include +#include "opencv2/imgproc/imgproc.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/calib3d/calib3d.hpp" +#include "opencv2/gpu/gpu.hpp" #include "performance.h" using namespace std; diff --git a/samples/gpu/stereo_multi.cpp b/samples/gpu/stereo_multi.cpp index 3ad3347c82..0e8f016bab 100644 --- a/samples/gpu/stereo_multi.cpp +++ b/samples/gpu/stereo_multi.cpp @@ -8,10 +8,10 @@ #endif #include -#include -#include -#include -#include +#include "cvconfig.h" +#include "opencv2/core/core.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/gpu/gpu.hpp" #if !defined(HAVE_CUDA) || !defined(HAVE_TBB) diff --git a/samples/gpu/surf_keypoint_matcher.cpp b/samples/gpu/surf_keypoint_matcher.cpp index eb8da5f193..b0a6081e64 100644 --- a/samples/gpu/surf_keypoint_matcher.cpp +++ b/samples/gpu/surf_keypoint_matcher.cpp @@ -1,9 +1,9 @@ #include -#include -#include -#include -#include +#include "opencv2/core/core.hpp" +#include "opencv2/features2d/features2d.hpp" +#include "opencv2/highgui/highgui.hpp" +#include "opencv2/gpu/gpu.hpp" using namespace std; using namespace cv;