generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Main module headers are moved 1 level up

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.rst
View File

@@ -23,9 +23,9 @@ OpenCV 2 received reorganization. No longer are all the functions crammed into a
.. code-block:: cpp
#include <opencv2/core/core.hpp>
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#include <opencv2/highgui.hpp>
All the OpenCV related stuff is put into the *cv* namespace to avoid name conflicts with other libraries data structures and functions. Therefore, either you need to prepend the *cv::* keyword before everything that comes from OpenCV or after the includes, you just add a directive to use this:

8
doc/tutorials/features2d/feature_description/feature_description.rst
View File

@@ -29,10 +29,10 @@ This tutorial code's is shown lines below. You can also download it from `here <
#include <stdio.h>
#include <iostream>
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/nonfree/features2d.hpp"
#include "opencv2/core.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/nonfree.hpp"
using namespace cv;

6
doc/tutorials/features2d/feature_detection/feature_detection.rst
View File

@@ -28,9 +28,9 @@ This tutorial code's is shown lines below. You can also download it from `here <
#include <stdio.h>
#include <iostream>
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/core.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/highgui.hpp"
using namespace cv;

6
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
View File

@@ -25,9 +25,9 @@ This tutorial code's is shown lines below. You can also download it from `here <
#include <stdio.h>
#include <iostream>
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/core.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/highgui.hpp"
using namespace cv;

8
doc/tutorials/features2d/feature_homography/feature_homography.rst
View File

@@ -26,10 +26,10 @@ This tutorial code's is shown lines below. You can also download it from `here <
#include <stdio.h>
#include <iostream>
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/core.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/calib3d.hpp"
using namespace cv;

4
doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst
View File

@@ -23,8 +23,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>

4
doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst
View File

@@ -22,8 +22,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>

4
doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst
View File

@@ -155,8 +155,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>

2
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
View File

File diff suppressed because one or more lines are too long

4
doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst
View File

@@ -74,8 +74,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "highgui.h"
#include <stdlib.h>
#include <stdio.h>

4
doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.rst
View File

@@ -122,8 +122,8 @@ Code
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
using namespace std;
using namespace cv;

4
doc/tutorials/imgproc/histograms/back_projection/back_projection.rst
View File

@@ -107,8 +107,8 @@ Code
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include <iostream>

4
doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst
View File

@@ -88,8 +88,8 @@ Code
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>

4
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
View File

@@ -86,8 +86,8 @@ Code
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>

4
doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.rst
View File

@@ -89,8 +89,8 @@ Code
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>

4
doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
View File

@@ -131,8 +131,8 @@ Code
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>

4
doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst
View File

@@ -90,8 +90,8 @@ Code
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include <stdlib.h>
#include <stdio.h>

4
doc/tutorials/imgproc/imgtrans/copyMakeBorder/copyMakeBorder.rst
View File

@@ -52,8 +52,8 @@ Code
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include <stdlib.h>
#include <stdio.h>

4
doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst
View File

@@ -77,8 +77,8 @@ Code
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include <stdlib.h>
#include <stdio.h>

4
doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst
View File

@@ -48,8 +48,8 @@ Code
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>

4
doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
View File

@@ -104,8 +104,8 @@ Code
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>

4
doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.rst
View File

@@ -59,8 +59,8 @@ Code
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include <stdlib.h>
#include <stdio.h>

4
doc/tutorials/imgproc/imgtrans/remap/remap.rst
View File

@@ -63,8 +63,8 @@ Code
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>

4
doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.rst
View File

@@ -125,8 +125,8 @@ Code
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include <stdlib.h>
#include <stdio.h>

4
doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst
View File

@@ -97,8 +97,8 @@ Code
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>

4
doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst
View File

@@ -115,8 +115,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include <stdlib.h>
#include <stdio.h>

4
doc/tutorials/imgproc/pyramids/pyramids.rst
View File

@@ -84,8 +84,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include <math.h>
#include <stdlib.h>
#include <stdio.h>

4
doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst
View File

@@ -25,8 +25,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>

4
doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst
View File

@@ -25,8 +25,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>

4
doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst
View File

@@ -23,8 +23,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>

4
doc/tutorials/imgproc/shapedescriptors/hull/hull.rst
View File

@@ -23,8 +23,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>

4
doc/tutorials/imgproc/shapedescriptors/moments/moments.rst
View File

@@ -25,8 +25,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>

4
doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst
View File

@@ -23,8 +23,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>
#include <stdlib.h>

4
doc/tutorials/imgproc/threshold/threshold.rst
View File

@@ -134,8 +134,8 @@ The tutorial code's is shown lines below. You can also download it from `here <h
.. code-block:: cpp
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include <stdlib.h>
#include <stdio.h>

6
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
View File

@@ -26,9 +26,9 @@ This tutorial code's is shown lines below. You can also download it from `here <
.. code-block:: cpp
#include "opencv2/objdetect/objdetect.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/objdetect.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include <iostream>
#include <stdio.h>