Main module headers are moved 1 level up

e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
This commit is contained in:
Andrey Kamaev
2013-03-13 16:22:44 +04:00
parent 061dd7e84e
commit ad5cddc007
266 changed files with 571 additions and 588 deletions

View File

@@ -43,8 +43,8 @@
#ifndef __OPENCV_STITCHING_STITCHER_HPP__
#define __OPENCV_STITCHING_STITCHER_HPP__
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/core.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/stitching/warpers.hpp"
#include "opencv2/stitching/detail/matchers.hpp"
#include "opencv2/stitching/detail/motion_estimators.hpp"

View File

@@ -43,7 +43,7 @@
#ifndef __OPENCV_STITCHING_AUTOCALIB_HPP__
#define __OPENCV_STITCHING_AUTOCALIB_HPP__
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#include "matchers.hpp"
namespace cv {

View File

@@ -43,7 +43,7 @@
#ifndef __OPENCV_STITCHING_BLENDERS_HPP__
#define __OPENCV_STITCHING_BLENDERS_HPP__
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
namespace cv {
namespace detail {

View File

@@ -43,7 +43,7 @@
#ifndef __OPENCV_STITCHING_CAMERA_HPP__
#define __OPENCV_STITCHING_CAMERA_HPP__
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
namespace cv {
namespace detail {

View File

@@ -43,7 +43,7 @@
#ifndef __OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP__
#define __OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP__
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
namespace cv {
namespace detail {

View File

@@ -43,12 +43,12 @@
#ifndef __OPENCV_STITCHING_MATCHERS_HPP__
#define __OPENCV_STITCHING_MATCHERS_HPP__
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/core.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_GPU
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/gpu.hpp"
#endif
namespace cv {

View File

@@ -43,7 +43,7 @@
#ifndef __OPENCV_STITCHING_MOTION_ESTIMATORS_HPP__
#define __OPENCV_STITCHING_MOTION_ESTIMATORS_HPP__
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#include "matchers.hpp"
#include "util.hpp"
#include "camera.hpp"

View File

@@ -44,7 +44,7 @@
#define __OPENCV_STITCHING_SEAM_FINDERS_HPP__
#include <set>
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#include "opencv2/opencv_modules.hpp"
namespace cv {

View File

@@ -44,7 +44,7 @@
#define __OPENCV_STITCHING_UTIL_HPP__
#include <list>
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#define ENABLE_LOG 0

View File

@@ -44,7 +44,7 @@
#define __OPENCV_STITCHING_UTIL_INL_HPP__
#include <queue>
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#include "util.hpp" // Make your IDE see declarations
namespace cv {

View File

@@ -43,11 +43,11 @@
#ifndef __OPENCV_STITCHING_WARPERS_HPP__
#define __OPENCV_STITCHING_WARPERS_HPP__
#include "opencv2/core/core.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/core.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_GPU
# include "opencv2/gpu/gpu.hpp"
# include "opencv2/gpu.hpp"
#endif
namespace cv {

View File

@@ -43,7 +43,7 @@
#ifndef __OPENCV_STITCHING_WARPERS_INL_HPP__
#define __OPENCV_STITCHING_WARPERS_INL_HPP__
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#include "warpers.hpp" // Make your IDE see declarations
namespace cv {