migration: github.com/opencv/opencv

pull/6885/head
Alexander Alekhin 9 years ago
parent 688bd28987
commit bb5e25ba7c
  1. 2
      CONTRIBUTING.md
  2. 2
      cmake/OpenCVPackaging.cmake
  3. 2
      cmake/templates/changelog.Debian.in
  4. 16
      doc/opencv_cheatsheet.tex
  5. 2
      doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst
  6. 2
      doc/tutorials/features2d/feature_description/feature_description.rst
  7. 2
      doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
  8. 2
      doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst
  9. 2
      doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.rst
  10. 2
      doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst
  11. 2
      doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst
  12. 2
      doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst
  13. 2
      doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.rst
  14. 6
      doc/tutorials/imgproc/histograms/back_projection/back_projection.rst
  15. 2
      doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst
  16. 2
      doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
  17. 2
      doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.rst
  18. 2
      doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
  19. 2
      doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst
  20. 2
      doc/tutorials/imgproc/imgtrans/copyMakeBorder/copyMakeBorder.rst
  21. 2
      doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst
  22. 4
      doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst
  23. 4
      doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
  24. 2
      doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.rst
  25. 2
      doc/tutorials/imgproc/imgtrans/remap/remap.rst
  26. 2
      doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.rst
  27. 2
      doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst
  28. 2
      doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst
  29. 2
      doc/tutorials/imgproc/pyramids/pyramids.rst
  30. 2
      doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst
  31. 2
      doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst
  32. 2
      doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst
  33. 2
      doc/tutorials/imgproc/shapedescriptors/hull/hull.rst
  34. 2
      doc/tutorials/imgproc/shapedescriptors/moments/moments.rst
  35. 2
      doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst
  36. 2
      doc/tutorials/imgproc/threshold/threshold.rst
  37. 2
      doc/tutorials/introduction/clojure_dev_intro/clojure_dev_intro.rst
  38. 6
      doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.rst
  39. 4
      doc/tutorials/introduction/desktop_java/java_dev_intro.rst
  40. 2
      doc/tutorials/introduction/display_image/display_image.rst
  41. 2
      doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
  42. 4
      doc/tutorials/introduction/ios_install/ios_install.rst
  43. 6
      doc/tutorials/introduction/linux_install/linux_install.rst
  44. 4
      doc/tutorials/introduction/windows_install/windows_install.rst
  45. 2
      doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
  46. 2
      doc/user_guide/ug_intelperc.rst
  47. 2
      doc/user_guide/ug_kinect.rst
  48. 2
      modules/core/doc/basic_structures.rst
  49. 2
      modules/features2d/test/test_lshindex_flannbased_matcher.cpp
  50. 2
      modules/gpu/doc/introduction.rst
  51. 2
      modules/highgui/doc/reading_and_writing_images_and_video.rst
  52. 2
      modules/highgui/doc/user_interface.rst
  53. 2
      modules/highgui/src/cap_libv4l.cpp
  54. 2
      modules/highgui/src/cap_v4l.cpp
  55. 2
      modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
  56. 2
      modules/objdetect/doc/cascade_classification.rst
  57. 2
      modules/python/test/test_digits.py
  58. 2
      modules/python/test/test_gaussian_mix.py
  59. 4
      modules/python/test/tests_common.py
  60. 2
      samples/android/camera-calibration/src/org/opencv/samples/cameracalibration/CameraCalibrationActivity.java
  61. 4
      samples/cpp/facial_features.cpp
  62. 2
      samples/cpp/stereo_calib.cpp
  63. 2
      samples/python/chessboard.py
  64. 2
      samples/python/cvutils.py
  65. 2
      samples/python/demhist.py
  66. 2
      samples/python/dft.py
  67. 2
      samples/python/distrans.py
  68. 2
      samples/python/edge.py
  69. 2
      samples/python/ffilldemo.py
  70. 2
      samples/python/fitellipse.py
  71. 2
      samples/python/houghlines.py
  72. 2
      samples/python/inpaint.py
  73. 2
      samples/python/logpolar.py
  74. 2
      samples/python/morphology.py
  75. 2
      samples/python/numpy_array.py
  76. 2
      samples/python/watershed.py

@ -1,3 +1,3 @@
## Contributing guidelines ## Contributing guidelines
All guidelines for contributing to the OpenCV repository can be found at [`How to contribute guideline`](https://github.com/Itseez/opencv/wiki/How_to_contribute). All guidelines for contributing to the OpenCV repository can be found at [`How to contribute guideline`](https://github.com/opencv/opencv/wiki/How_to_contribute).

@ -340,7 +340,7 @@ if(CPACK_GENERATOR STREQUAL "DEB")
set(CHANGELOG_OUT_FILE "${CMAKE_BINARY_DIR}/deb-packages-gen/${comp}/changelog") set(CHANGELOG_OUT_FILE "${CMAKE_BINARY_DIR}/deb-packages-gen/${comp}/changelog")
set(CHANGELOG_OUT_FILE_GZ "${CMAKE_BINARY_DIR}/deb-packages-gen/${comp}/changelog.gz") set(CHANGELOG_OUT_FILE_GZ "${CMAKE_BINARY_DIR}/deb-packages-gen/${comp}/changelog.gz")
file(WRITE ${CHANGELOG_OUT_FILE} "Upstream changelog stub. See https://github.com/Itseez/opencv/wiki/ChangeLog") file(WRITE ${CHANGELOG_OUT_FILE} "Upstream changelog stub. See https://github.com/opencv/opencv/wiki/ChangeLog")
execute_process(COMMAND "${GZIP_TOOL}" "-ncf9" "${CHANGELOG_OUT_FILE}" execute_process(COMMAND "${GZIP_TOOL}" "-ncf9" "${CHANGELOG_OUT_FILE}"
OUTPUT_FILE "${CHANGELOG_OUT_FILE_GZ}" OUTPUT_FILE "${CHANGELOG_OUT_FILE_GZ}"

@ -1,5 +1,5 @@
@CHANGELOG_PACKAGE_NAME@ (@CPACK_PACKAGE_VERSION@) unstable; urgency=low @CHANGELOG_PACKAGE_NAME@ (@CPACK_PACKAGE_VERSION@) unstable; urgency=low
* Debian changelog stub. See https://github.com/Itseez/opencv/wiki/ChangeLog * Debian changelog stub. See https://github.com/opencv/opencv/wiki/ChangeLog
or release notes in user or release notes in user
documentation for more details. documentation for more details.
-- @CPACK_PACKAGE_CONTACT@ @CHANGELOG_PACKAGE_DATE@ -- @CPACK_PACKAGE_CONTACT@ @CHANGELOG_PACKAGE_DATE@

@ -437,7 +437,7 @@ Example. Decimate image by factor of $\sqrt{2}$:\\
\texttt{\href{http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html\#watershed}{watershed()}}, \texttt{\href{http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html\#watershed}{watershed()}},
\texttt{\href{http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html\#grabcut}{grabCut()}} \texttt{\href{http://docs.opencv.org/modules/imgproc/doc/miscellaneous_transformations.html\#grabcut}{grabCut()}}
& marker-based image segmentation algorithms. & marker-based image segmentation algorithms.
See the samples \texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/cpp/watershed.cpp}{watershed.cpp}} and \texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/cpp/grabcut.cpp}{grabcut.cpp}}. See the samples \texttt{\href{https://github.com/opencv/opencv/tree/master/samples/cpp/watershed.cpp}{watershed.cpp}} and \texttt{\href{https://github.com/opencv/opencv/tree/master/samples/cpp/grabcut.cpp}{grabcut.cpp}}.
\end{tabular} \end{tabular}
@ -465,7 +465,7 @@ Example. Compute Hue-Saturation histogram of an image:\\
\end{tabbing} \end{tabbing}
\subsection{Contours} \subsection{Contours}
See \texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/cpp/contours2.cpp}{contours2.cpp}} and \texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/cpp/squares.cpp}{squares.cpp}} See \texttt{\href{https://github.com/opencv/opencv/tree/master/samples/cpp/contours2.cpp}{contours2.cpp}} and \texttt{\href{https://github.com/opencv/opencv/tree/master/samples/cpp/squares.cpp}{squares.cpp}}
samples on what are the contours and how to use them. samples on what are the contours and how to use them.
\section{Data I/O} \section{Data I/O}
@ -559,7 +559,7 @@ samples on what are the contours and how to use them.
\end{tabular} \end{tabular}
See \texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/cpp/camshiftdemo.cpp}{camshiftdemo.cpp}} and other \href{https://github.com/Itseez/opencv/tree/master/samples/}{OpenCV samples} on how to use the GUI functions. See \texttt{\href{https://github.com/opencv/opencv/tree/master/samples/cpp/camshiftdemo.cpp}{camshiftdemo.cpp}} and other \href{https://github.com/opencv/opencv/tree/master/samples/}{OpenCV samples} on how to use the GUI functions.
\section{Camera Calibration, Pose Estimation and Depth Estimation} \section{Camera Calibration, Pose Estimation and Depth Estimation}
@ -586,10 +586,10 @@ See \texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/cpp/camsh
\end{tabular} \end{tabular}
To calibrate a camera, you can use \texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/cpp/calibration.cpp}{calibration.cpp}} or To calibrate a camera, you can use \texttt{\href{https://github.com/opencv/opencv/tree/master/samples/cpp/calibration.cpp}{calibration.cpp}} or
\texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/cpp/stereo\_calib.cpp}{stereo\_calib.cpp}} samples. \texttt{\href{https://github.com/opencv/opencv/tree/master/samples/cpp/stereo\_calib.cpp}{stereo\_calib.cpp}} samples.
To get the disparity maps and the point clouds, use To get the disparity maps and the point clouds, use
\texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/cpp/stereo\_match.cpp}{stereo\_match.cpp}} sample. \texttt{\href{https://github.com/opencv/opencv/tree/master/samples/cpp/stereo\_match.cpp}{stereo\_match.cpp}} sample.
\section{Object Detection} \section{Object Detection}
@ -597,9 +597,9 @@ To get the disparity maps and the point clouds, use
@{}p{\linewidth-\the\MyLen}@{}} @{}p{\linewidth-\the\MyLen}@{}}
\texttt{\href{http://docs.opencv.org/modules/imgproc/doc/object_detection.html\#matchtemplate}{matchTemplate}} & Compute proximity map for given template.\\ \texttt{\href{http://docs.opencv.org/modules/imgproc/doc/object_detection.html\#matchtemplate}{matchTemplate}} & Compute proximity map for given template.\\
\texttt{\href{http://docs.opencv.org/modules/objdetect/doc/cascade_classification.html\#cascadeclassifier}{CascadeClassifier}} & Viola's Cascade of Boosted classifiers using Haar or LBP features. Suits for detecting faces, facial features and some other objects without diverse textures. See \texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/c/facedetect.cpp}{facedetect.cpp}}\\ \texttt{\href{http://docs.opencv.org/modules/objdetect/doc/cascade_classification.html\#cascadeclassifier}{CascadeClassifier}} & Viola's Cascade of Boosted classifiers using Haar or LBP features. Suits for detecting faces, facial features and some other objects without diverse textures. See \texttt{\href{https://github.com/opencv/opencv/tree/master/samples/c/facedetect.cpp}{facedetect.cpp}}\\
\texttt{{HOGDescriptor}} & N. Dalal's object detector using Histogram-of-Oriented-Gradients (HOG) features. Suits for detecting people, cars and other objects with well-defined silhouettes. See \texttt{\href{https://github.com/Itseez/opencv/tree/master/samples/cpp/peopledetect.cpp}{peopledetect.cpp}}\\ \texttt{{HOGDescriptor}} & N. Dalal's object detector using Histogram-of-Oriented-Gradients (HOG) features. Suits for detecting people, cars and other objects with well-defined silhouettes. See \texttt{\href{https://github.com/opencv/opencv/tree/master/samples/cpp/peopledetect.cpp}{peopledetect.cpp}}\\
\end{tabular} \end{tabular}

@ -56,7 +56,7 @@ Scalar
Code Code
===== =====
* This code is in your OpenCV sample folder. Otherwise you can grab it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp>`_ * This code is in your OpenCV sample folder. Otherwise you can grab it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp>`_
Explanation Explanation
============= =============

@ -23,7 +23,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -19,7 +19,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp>`_
.. literalinclude:: ../../../../samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp .. literalinclude:: ../../../../samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp
:language: cpp :language: cpp

@ -19,7 +19,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -20,7 +20,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp>`_
.. literalinclude:: ../../../../../samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp .. literalinclude:: ../../../../../samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp
:language: cpp :language: cpp

@ -18,7 +18,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -151,7 +151,7 @@ How does it work?
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/TrackingMotion/cornerHarris_Demo.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/TrackingMotion/cornerHarris_Demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -70,7 +70,7 @@ Erosion
Code Code
====== ======
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -115,7 +115,7 @@ Code
* Applies 4 different kinds of filters (explained in Theory) and show the filtered images sequentially * Applies 4 different kinds of filters (explained in Theory) and show the filtered images sequentially
* **Downloadable code**: * **Downloadable code**:
Click `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp>`_ Click `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp>`_
* **Code at glance:** * **Code at glance:**

@ -99,9 +99,9 @@ Code
* **Downloadable code**: * **Downloadable code**:
a. Click `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo1.cpp>`_ for the basic version (explained in this tutorial). a. Click `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo1.cpp>`_ for the basic version (explained in this tutorial).
b. For stuff slightly fancier (using H-S histograms and floodFill to define a mask for the skin area) you can check the `improved demo <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo2.cpp>`_ b. For stuff slightly fancier (using H-S histograms and floodFill to define a mask for the skin area) you can check the `improved demo <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/calcBackProject_Demo2.cpp>`_
c. ...or you can always check out the classical `camshiftdemo <https://github.com/Itseez/opencv/tree/master/samples/cpp/camshiftdemo.cpp>`_ in samples. c. ...or you can always check out the classical `camshiftdemo <https://github.com/opencv/opencv/tree/master/samples/cpp/camshiftdemo.cpp>`_ in samples.
* **Code at glance:** * **Code at glance:**

@ -82,7 +82,7 @@ Code
* Plot the three histograms in a window * Plot the three histograms in a window
* **Downloadable code**: * **Downloadable code**:
Click `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/calcHist_Demo.cpp>`_ Click `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/calcHist_Demo.cpp>`_
* **Code at glance:** * **Code at glance:**

@ -80,7 +80,7 @@ Code
* Display the numerical matching parameters obtained. * Display the numerical matching parameters obtained.
* **Downloadable code**: * **Downloadable code**:
Click `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp>`_ Click `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp>`_
* **Code at glance:** * **Code at glance:**

@ -83,7 +83,7 @@ Code
* Display the source and equalized images in a window. * Display the source and equalized images in a window.
* **Downloadable code**: * **Downloadable code**:
Click `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp>`_ Click `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/EqualizeHist_Demo.cpp>`_
* **Code at glance:** * **Code at glance:**

@ -125,7 +125,7 @@ Code
* Draw a rectangle around the area corresponding to the highest match * Draw a rectangle around the area corresponding to the highest match
* **Downloadable code**: * **Downloadable code**:
Click `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp>`_ Click `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp>`_
* **Code at glance:** * **Code at glance:**

@ -86,7 +86,7 @@ Code
* Applies the *Canny Detector* and generates a **mask** (bright lines representing the edges on a black background). * Applies the *Canny Detector* and generates a **mask** (bright lines representing the edges on a black background).
* Applies the mask obtained on the original image and display it in a window. * Applies the mask obtained on the original image and display it in a window.
#. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/CannyDetector_Demo.cpp>`_ #. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/CannyDetector_Demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -47,7 +47,7 @@ Code
The user chooses either option by pressing 'c' (constant) or 'r' (replicate) The user chooses either option by pressing 'c' (constant) or 'r' (replicate)
* The program finishes when the user presses 'ESC' * The program finishes when the user presses 'ESC'
#. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp>`_ #. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -72,7 +72,7 @@ Code
* The filter output (with each kernel) will be shown during 500 milliseconds * The filter output (with each kernel) will be shown during 500 milliseconds
#. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/filter2D_demo.cpp>`_ #. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/filter2D_demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -40,9 +40,9 @@ Code
* Display the detected circle in a window. * Display the detected circle in a window.
.. |TutorialHoughCirclesSimpleDownload| replace:: here .. |TutorialHoughCirclesSimpleDownload| replace:: here
.. _TutorialHoughCirclesSimpleDownload: https://github.com/Itseez/opencv/tree/master/samples/cpp/houghcircles.cpp .. _TutorialHoughCirclesSimpleDownload: https://github.com/opencv/opencv/tree/master/samples/cpp/houghcircles.cpp
.. |TutorialHoughCirclesFancyDownload| replace:: here .. |TutorialHoughCirclesFancyDownload| replace:: here
.. _TutorialHoughCirclesFancyDownload: https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp .. _TutorialHoughCirclesFancyDownload: https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
#. The sample code that we will explain can be downloaded from |TutorialHoughCirclesSimpleDownload|_. A slightly fancier version (which shows both Hough standard and probabilistic with trackbars for changing the threshold values) can be found |TutorialHoughCirclesFancyDownload|_. #. The sample code that we will explain can be downloaded from |TutorialHoughCirclesSimpleDownload|_. A slightly fancier version (which shows both Hough standard and probabilistic with trackbars for changing the threshold values) can be found |TutorialHoughCirclesFancyDownload|_.

@ -89,9 +89,9 @@ Code
====== ======
.. |TutorialHoughLinesSimpleDownload| replace:: here .. |TutorialHoughLinesSimpleDownload| replace:: here
.. _TutorialHoughLinesSimpleDownload: https://github.com/Itseez/opencv/tree/master/samples/cpp/houghlines.cpp .. _TutorialHoughLinesSimpleDownload: https://github.com/opencv/opencv/tree/master/samples/cpp/houghlines.cpp
.. |TutorialHoughLinesFancyDownload| replace:: here .. |TutorialHoughLinesFancyDownload| replace:: here
.. _TutorialHoughLinesFancyDownload: https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp .. _TutorialHoughLinesFancyDownload: https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/HoughLines_Demo.cpp
#. **What does this program do?** #. **What does this program do?**

@ -55,7 +55,7 @@ Code
* Applies a Laplacian operator to the grayscale image and stores the output image * Applies a Laplacian operator to the grayscale image and stores the output image
* Display the result in a window * Display the result in a window
#. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/Laplace_Demo.cpp>`_ #. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/Laplace_Demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -59,7 +59,7 @@ Code
* Each second, apply 1 of 4 different remapping processes to the image and display them indefinitely in a window. * Each second, apply 1 of 4 different remapping processes to the image and display them indefinitely in a window.
* Wait for the user to exit the program * Wait for the user to exit the program
#. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/Remap_Demo.cpp>`_ #. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/Remap_Demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -121,7 +121,7 @@ Code
* Applies the *Sobel Operator* and generates as output an image with the detected *edges* bright on a darker background. * Applies the *Sobel Operator* and generates as output an image with the detected *edges* bright on a darker background.
#. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp>`_ #. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -93,7 +93,7 @@ Code
* Applies a Rotation to the image after being transformed. This rotation is with respect to the image center * Applies a Rotation to the image after being transformed. This rotation is with respect to the image center
* Waits until the user exits the program * Waits until the user exits the program
#. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/Geometric_Transforms_Demo.cpp>`_ #. The tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgTrans/Geometric_Transforms_Demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -111,7 +111,7 @@ Black Hat
Code Code
====== ======
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -80,7 +80,7 @@ Gaussian Pyramid
Code Code
====== ======
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -21,7 +21,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo1.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo1.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -21,7 +21,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo2.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/generalContours_demo2.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -19,7 +19,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/findContours_demo.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/findContours_demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -19,7 +19,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/hull_demo.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/hull_demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -21,7 +21,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -19,7 +19,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -130,7 +130,7 @@ Threshold to Zero, Inverted
Code Code
====== ======
The tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/ImgProc/Threshold.cpp>`_ The tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/ImgProc/Threshold.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -51,7 +51,7 @@ OpenCV on Mac OS X:
cd ~/ cd ~/
mkdir opt mkdir opt
git clone https://github.com/Itseez/opencv.git git clone https://github.com/opencv/opencv.git
cd opencv cd opencv
git checkout 2.4 git checkout 2.4
mkdir build mkdir build

@ -42,7 +42,7 @@ Getting OpenCV Source Code
========================== ==========================
You can use the latest stable OpenCV version available in *sourceforge* or you can grab the latest You can use the latest stable OpenCV version available in *sourceforge* or you can grab the latest
snapshot from our `Git repository <https://github.com/Itseez/opencv.git>`_. snapshot from our `Git repository <https://github.com/opencv/opencv.git>`_.
Getting the Latest Stable OpenCV Version Getting the Latest Stable OpenCV Version
@ -56,14 +56,14 @@ Getting the Latest Stable OpenCV Version
Getting the Cutting-edge OpenCV from the Git Repository Getting the Cutting-edge OpenCV from the Git Repository
------------------------------------------------------- -------------------------------------------------------
Launch Git client and clone `OpenCV repository <http://github.com/itseez/opencv>`_ Launch Git client and clone `OpenCV repository <http://github.com/opencv/opencv>`_
In Linux it can be achieved with the following command in Terminal: In Linux it can be achieved with the following command in Terminal:
.. code-block:: bash .. code-block:: bash
cd ~/<my_working _directory> cd ~/<my_working _directory>
git clone https://github.com/Itseez/opencv.git git clone https://github.com/opencv/opencv.git
Building OpenCV Building OpenCV

@ -41,7 +41,7 @@ The most simple way to get it is downloading the appropriate package of **versio
For other OSes it's required to build OpenCV from sources. For other OSes it's required to build OpenCV from sources.
Another option to get OpenCV sources is to clone `OpenCV git repository Another option to get OpenCV sources is to clone `OpenCV git repository
<https://github.com/Itseez/opencv/>`_. <https://github.com/opencv/opencv/>`_.
In order to build OpenCV with Java bindings you need :abbr:`JDK (Java Development Kit)` In order to build OpenCV with Java bindings you need :abbr:`JDK (Java Development Kit)`
(we recommend `Oracle/Sun JDK 6 or 7 <http://www.oracle.com/technetwork/java/javase/downloads/>`_), (we recommend `Oracle/Sun JDK 6 or 7 <http://www.oracle.com/technetwork/java/javase/downloads/>`_),
`Apache Ant <http://ant.apache.org/>`_ and `Python` v2.6 or higher to be installed. `Apache Ant <http://ant.apache.org/>`_ and `Python` v2.6 or higher to be installed.
@ -53,7 +53,7 @@ Let's build OpenCV:
.. code-block:: bash .. code-block:: bash
git clone git://github.com/Itseez/opencv.git git clone git://github.com/opencv/opencv.git
cd opencv cd opencv
git checkout 2.4 git checkout 2.4
mkdir build mkdir build

@ -17,7 +17,7 @@ In this tutorial you will learn how to:
Source Code Source Code
=========== ===========
Download the source code from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp>`_. Download the source code from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp>`_.
.. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
:language: cpp :language: cpp

@ -64,7 +64,7 @@ In our world, achieving some tasks is possible in multiple ways. However, some o
Now the best option would be to do the integration yourself. For this, you first need to have the source code. I recommend following the guides for your operating system on acquiring OpenCV sources. For Linux users look :ref:`here <Linux-Installation>` and for :ref:`Windows here <Windows_Installation>`. You must also install python and sphinx with its dependencies in order to be able to build the documentation. Now the best option would be to do the integration yourself. For this, you first need to have the source code. I recommend following the guides for your operating system on acquiring OpenCV sources. For Linux users look :ref:`here <Linux-Installation>` and for :ref:`Windows here <Windows_Installation>`. You must also install python and sphinx with its dependencies in order to be able to build the documentation.
Once you have downloaded the repository to your hard drive you can take a look in the OpenCV directory to make sure you have both the samples and doc folder present. Anyone may download the latest source files from :file:`git://github.com/Itseez/opencv.git`. Nevertheless, not everyone has upload (commit/submit) rights. This is to protect the integrity of the library. If you plan doing more than one tutorial, and would like to have an account with commit user rights you should first register an account at http://code.opencv.org/ and then contact OpenCV administrator -delete-admin@-delete-opencv.org. Otherwise, you can just send the resulting files to us at -delete-admin@-delete-opencv.org and we'll add it. Once you have downloaded the repository to your hard drive you can take a look in the OpenCV directory to make sure you have both the samples and doc folder present. Anyone may download the latest source files from :file:`git://github.com/opencv/opencv.git`. Nevertheless, not everyone has upload (commit/submit) rights. This is to protect the integrity of the library. If you plan doing more than one tutorial, and would like to have an account with commit user rights you should first register an account at http://code.opencv.org/ and then contact OpenCV administrator -delete-admin@-delete-opencv.org. Otherwise, you can just send the resulting files to us at -delete-admin@-delete-opencv.org and we'll add it.
Format the Source Code Format the Source Code
====================== ======================

@ -12,14 +12,14 @@ Required Packages
Getting the Cutting-edge OpenCV from Git Repository Getting the Cutting-edge OpenCV from Git Repository
--------------------------------------------------- ---------------------------------------------------
Launch GIT client and clone OpenCV repository from `here <http://github.com/itseez/opencv>`_ Launch GIT client and clone OpenCV repository from `here <http://github.com/opencv/opencv>`_
In MacOS it can be done using the following command in Terminal: In MacOS it can be done using the following command in Terminal:
.. code-block:: bash .. code-block:: bash
cd ~/<my_working _directory> cd ~/<my_working _directory>
git clone https://github.com/Itseez/opencv.git git clone https://github.com/opencv/opencv.git
Building OpenCV from Source, using CMake and Command Line Building OpenCV from Source, using CMake and Command Line

@ -29,7 +29,7 @@ The packages can be installed using a terminal and the following commands or by
Getting OpenCV Source Code Getting OpenCV Source Code
========================== ==========================
You can use the latest stable OpenCV version available in *sourceforge* or you can grab the latest snapshot from our `Git repository <https://github.com/Itseez/opencv.git>`_. You can use the latest stable OpenCV version available in *sourceforge* or you can grab the latest snapshot from our `Git repository <https://github.com/opencv/opencv.git>`_.
Getting the Latest Stable OpenCV Version Getting the Latest Stable OpenCV Version
---------------------------------------- ----------------------------------------
@ -42,14 +42,14 @@ Getting the Latest Stable OpenCV Version
Getting the Cutting-edge OpenCV from the Git Repository Getting the Cutting-edge OpenCV from the Git Repository
------------------------------------------------------- -------------------------------------------------------
Launch Git client and clone `OpenCV repository <http://github.com/itseez/opencv>`_ Launch Git client and clone `OpenCV repository <http://github.com/opencv/opencv>`_
In Linux it can be achieved with the following command in Terminal: In Linux it can be achieved with the following command in Terminal:
.. code-block:: bash .. code-block:: bash
cd ~/<my_working _directory> cd ~/<my_working _directory>
git clone https://github.com/Itseez/opencv.git git clone https://github.com/opencv/opencv.git
Building OpenCV from Source Using CMake, Using the Command Line Building OpenCV from Source Using CMake, Using the Command Line

@ -46,7 +46,7 @@ You may find the content of this tutorial also inside the following videos: `Par
.. warning:: These videos above are long-obsolete and contain inaccurate information. Be careful, since solutions described in those videos are no longer supported and may even break your install. .. warning:: These videos above are long-obsolete and contain inaccurate information. Be careful, since solutions described in those videos are no longer supported and may even break your install.
If you are building your own libraries you can take the source files from our `Git repository <https://github.com/Itseez/opencv.git>`_. If you are building your own libraries you can take the source files from our `Git repository <https://github.com/opencv/opencv.git>`_.
Building the OpenCV library from scratch requires a couple of tools installed beforehand: Building the OpenCV library from scratch requires a couple of tools installed beforehand:
@ -128,7 +128,7 @@ Building the library
#. Choose a directory in your file system, where you will download the OpenCV libraries to. I recommend creating a new one that has short path and no special charachters in it, for example :file:`D:/OpenCV`. For this tutorial I'll suggest you do so. If you use your own path and know, what you're doing -- it's OK. #. Choose a directory in your file system, where you will download the OpenCV libraries to. I recommend creating a new one that has short path and no special charachters in it, for example :file:`D:/OpenCV`. For this tutorial I'll suggest you do so. If you use your own path and know, what you're doing -- it's OK.
a) Clone the repository to the selected directory. After clicking *Clone* button, a window will appear where you can select from what repository you want to download source files (https://github.com/Itseez/opencv.git) and to what directory (:file:`D:/OpenCV`). a) Clone the repository to the selected directory. After clicking *Clone* button, a window will appear where you can select from what repository you want to download source files (https://github.com/opencv/opencv.git) and to what directory (:file:`D:/OpenCV`).
#) Push the OK button and be patient as the repository is quite a heavy download. It will take some time depending on your Internet connection. #) Push the OK button and be patient as the repository is quite a heavy download. It will take some time depending on your Internet connection.

@ -22,7 +22,7 @@ Theory
Code Code
==== ====
This tutorial code's is shown lines below. You can also download it from `here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/objectDetection/objectDetection.cpp>`_ . The second version (using LBP for face detection) can be `found here <https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp>`_ This tutorial code's is shown lines below. You can also download it from `here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/objectDetection/objectDetection.cpp>`_ . The second version (using LBP for face detection) can be `found here <https://github.com/opencv/opencv/tree/master/samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp>`_
.. code-block:: cpp .. code-block:: cpp

@ -76,4 +76,4 @@ Since two types of sensor's data generators are supported (image generator and d
For more information please refer to the example of usage intelperc_capture.cpp_ in ``opencv/samples/cpp`` folder. For more information please refer to the example of usage intelperc_capture.cpp_ in ``opencv/samples/cpp`` folder.
.. _intelperc_capture.cpp: https://github.com/Itseez/opencv/tree/master/samples/cpp/intelperc_capture.cpp .. _intelperc_capture.cpp: https://github.com/opencv/opencv/tree/master/samples/cpp/intelperc_capture.cpp

@ -130,4 +130,4 @@ Flags specifing the needed generator type must be used in combination with parti
For more information please refer to the example of usage openni_capture.cpp_ in ``opencv/samples/cpp`` folder. For more information please refer to the example of usage openni_capture.cpp_ in ``opencv/samples/cpp`` folder.
.. _openni_capture.cpp: https://github.com/Itseez/opencv/tree/master/samples/cpp/openni_capture.cpp .. _openni_capture.cpp: https://github.com/opencv/opencv/tree/master/samples/cpp/openni_capture.cpp

@ -2898,5 +2898,5 @@ The above methods are usually enough for users. If you want to make your own alg
* Make a class and specify ``Algorithm`` as its base class. * Make a class and specify ``Algorithm`` as its base class.
* The algorithm parameters should be the class members. See ``Algorithm::get()`` for the list of possible types of the parameters. * The algorithm parameters should be the class members. See ``Algorithm::get()`` for the list of possible types of the parameters.
* Add public virtual method ``AlgorithmInfo* info() const;`` to your class. * Add public virtual method ``AlgorithmInfo* info() const;`` to your class.
* Add constructor function, ``AlgorithmInfo`` instance and implement the ``info()`` method. The simplest way is to take https://github.com/Itseez/opencv/tree/master/modules/ml/src/ml_init.cpp as the reference and modify it according to the list of your parameters. * Add constructor function, ``AlgorithmInfo`` instance and implement the ``info()`` method. The simplest way is to take https://github.com/opencv/opencv/tree/master/modules/ml/src/ml_init.cpp as the reference and modify it according to the list of your parameters.
* Add some public function (e.g. ``initModule_<mymodule>()``) that calls info() of your algorithm and put it into the same source file as ``info()`` implementation. This is to force C++ linker to include this object file into the target application. See ``Algorithm::create()`` for details. * Add some public function (e.g. ``initModule_<mymodule>()``) that calls info() of your algorithm and put it into the same source file as ``info()`` implementation. This is to force C++ linker to include this object file into the target application. See ``Algorithm::create()`` for details.

@ -31,7 +31,7 @@
For OpenCV2.4/OpenCV3.0 For OpenCV2.4/OpenCV3.0
Test for Pull Request # 3829 Test for Pull Request # 3829
https://github.com/Itseez/opencv/pull/3829 https://github.com/opencv/opencv/pull/3829
This test code creates brute force matcher for accuracy of reference, and the test target matcher. This test code creates brute force matcher for accuracy of reference, and the test target matcher.
Then, add() and train() transformed query image descriptors, and some outlier images descriptors to both matchers. Then, add() and train() transformed query image descriptors, and some outlier images descriptors to both matchers.

@ -59,4 +59,4 @@ While developing algorithms for multiple GPUs, note a data passing overhead. For
With this algorithm, a dual GPU gave a 180 With this algorithm, a dual GPU gave a 180
% %
performance increase comparing to the single Fermi GPU. For a source code example, see performance increase comparing to the single Fermi GPU. For a source code example, see
https://github.com/Itseez/opencv/tree/master/samples/gpu/. https://github.com/opencv/opencv/tree/master/samples/gpu/.

@ -319,7 +319,7 @@ The methods/functions grab the next frame from video file or camera and return t
The primary use of the function is in multi-camera environments, especially when the cameras do not have hardware synchronization. That is, you call ``VideoCapture::grab()`` for each camera and after that call the slower method ``VideoCapture::retrieve()`` to decode and get frame from each camera. This way the overhead on demosaicing or motion jpeg decompression etc. is eliminated and the retrieved frames from different cameras will be closer in time. The primary use of the function is in multi-camera environments, especially when the cameras do not have hardware synchronization. That is, you call ``VideoCapture::grab()`` for each camera and after that call the slower method ``VideoCapture::retrieve()`` to decode and get frame from each camera. This way the overhead on demosaicing or motion jpeg decompression etc. is eliminated and the retrieved frames from different cameras will be closer in time.
Also, when a connected camera is multi-head (for example, a stereo camera or a Kinect device), the correct way of retrieving data from it is to call `VideoCapture::grab` first and then call :ocv:func:`VideoCapture::retrieve` one or more times with different values of the ``channel`` parameter. See https://github.com/Itseez/opencv/tree/master/samples/cpp/openni_capture.cpp Also, when a connected camera is multi-head (for example, a stereo camera or a Kinect device), the correct way of retrieving data from it is to call `VideoCapture::grab` first and then call :ocv:func:`VideoCapture::retrieve` one or more times with different values of the ``channel`` parameter. See https://github.com/opencv/opencv/tree/master/samples/cpp/openni_capture.cpp
VideoCapture::retrieve VideoCapture::retrieve

@ -224,7 +224,7 @@ Sets mouse handler for the specified window
:param winname: Window name :param winname: Window name
:param onMouse: Mouse callback. See OpenCV samples, such as https://github.com/Itseez/opencv/tree/master/samples/cpp/ffilldemo.cpp, on how to specify and use the callback. :param onMouse: Mouse callback. See OpenCV samples, such as https://github.com/opencv/opencv/tree/master/samples/cpp/ffilldemo.cpp, on how to specify and use the callback.
:param userdata: The optional parameter passed to the callback. :param userdata: The optional parameter passed to the callback.

@ -16,7 +16,7 @@ For Release: OpenCV-Linux Beta4 opencv-0.9.6
Tested On: LMLBT44 with 8 video inputs Tested On: LMLBT44 with 8 video inputs
Problems? Post your questions at answers.opencv.org, Problems? Post your questions at answers.opencv.org,
Report bugs at code.opencv.org, Report bugs at code.opencv.org,
Submit your fixes at https://github.com/Itseez/opencv/ Submit your fixes at https://github.com/opencv/opencv/
Patched Comments: Patched Comments:
TW: The cv cam utils that came with the initial release of OpenCV for LINUX Beta4 TW: The cv cam utils that came with the initial release of OpenCV for LINUX Beta4

@ -16,7 +16,7 @@ For Release: OpenCV-Linux Beta4 opencv-0.9.6
Tested On: LMLBT44 with 8 video inputs Tested On: LMLBT44 with 8 video inputs
Problems? Post your questions at answers.opencv.org, Problems? Post your questions at answers.opencv.org,
Report bugs at code.opencv.org, Report bugs at code.opencv.org,
Submit your fixes at https://github.com/Itseez/opencv/ Submit your fixes at https://github.com/opencv/opencv/
Patched Comments: Patched Comments:
TW: The cv cam utils that came with the initial release of OpenCV for LINUX Beta4 TW: The cv cam utils that came with the initial release of OpenCV for LINUX Beta4

@ -296,7 +296,7 @@ Approximates a polygonal curve(s) with the specified precision.
The functions ``approxPolyDP`` approximate a curve or a polygon with another curve/polygon with less vertices so that the distance between them is less or equal to the specified precision. It uses the Douglas-Peucker algorithm The functions ``approxPolyDP`` approximate a curve or a polygon with another curve/polygon with less vertices so that the distance between them is less or equal to the specified precision. It uses the Douglas-Peucker algorithm
http://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm http://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
See https://github.com/Itseez/opencv/tree/master/samples/cpp/contours2.cpp for the function usage model. See https://github.com/opencv/opencv/tree/master/samples/cpp/contours2.cpp for the function usage model.
ApproxChains ApproxChains

@ -21,7 +21,7 @@ The word "cascade" in the classifier name means that the resultant classifier co
The feature used in a particular classifier is specified by its shape (1a, 2b etc.), position within the region of interest and the scale (this scale is not the same as the scale used at the detection stage, though these two scales are multiplied). For example, in the case of the third line feature (2c) the response is calculated as the difference between the sum of image pixels under the rectangle covering the whole feature (including the two white stripes and the black stripe in the middle) and the sum of the image pixels under the black stripe multiplied by 3 in order to compensate for the differences in the size of areas. The sums of pixel values over a rectangular regions are calculated rapidly using integral images (see below and the :ocv:func:`integral` description). The feature used in a particular classifier is specified by its shape (1a, 2b etc.), position within the region of interest and the scale (this scale is not the same as the scale used at the detection stage, though these two scales are multiplied). For example, in the case of the third line feature (2c) the response is calculated as the difference between the sum of image pixels under the rectangle covering the whole feature (including the two white stripes and the black stripe in the middle) and the sum of the image pixels under the black stripe multiplied by 3 in order to compensate for the differences in the size of areas. The sums of pixel values over a rectangular regions are calculated rapidly using integral images (see below and the :ocv:func:`integral` description).
To see the object detector at work, have a look at the facedetect demo: To see the object detector at work, have a look at the facedetect demo:
https://github.com/Itseez/opencv/tree/master/samples/cpp/dbt_face_detection.cpp https://github.com/opencv/opencv/tree/master/samples/cpp/dbt_face_detection.cpp
The following reference is for the detection part only. There is a separate application called ``opencv_traincascade`` that can train a cascade of boosted classifiers from a set of samples. The following reference is for the detection part only. There is a separate application called ``opencv_traincascade`` that can train a cascade of boosted classifiers from a set of samples.

@ -58,7 +58,7 @@ def deskew(img):
class StatModel(object): class StatModel(object):
def load(self, fn): def load(self, fn):
self.model.load(fn) # Known bug: https://github.com/Itseez/opencv/issues/4969 self.model.load(fn) # Known bug: https://github.com/opencv/opencv/issues/4969
def save(self, fn): def save(self, fn):
self.model.save(fn) self.model.save(fn)

@ -41,7 +41,7 @@ class gaussian_mix_test(NewOpenCVTests):
em = cv2.EM(cluster_n,cv2.EM_COV_MAT_GENERIC) em = cv2.EM(cluster_n,cv2.EM_COV_MAT_GENERIC)
em.train(points) em.train(points)
means = em.getMat("means") means = em.getMat("means")
covs = em.getMatVector("covs") # Known bug: https://github.com/Itseez/opencv/pull/4232 covs = em.getMatVector("covs") # Known bug: https://github.com/opencv/opencv/pull/4232
found_distrs = zip(means, covs) found_distrs = zip(means, covs)
matches_count = 0 matches_count = 0

@ -21,7 +21,7 @@ class OpenCVTests(unittest.TestCase):
# path to local repository folder containing 'samples' folder # path to local repository folder containing 'samples' folder
repoPath = None repoPath = None
# github repository url # github repository url
repoUrl = 'https://raw.github.com/Itseez/opencv/2.4' repoUrl = 'https://raw.github.com/opencv/opencv/2.4'
# path to local folder containing 'camera_calibration.tar.gz' # path to local folder containing 'camera_calibration.tar.gz'
dataPath = None dataPath = None
# data url # data url
@ -126,7 +126,7 @@ class NewOpenCVTests(unittest.TestCase):
repoPath = None repoPath = None
extraTestDataPath = None extraTestDataPath = None
# github repository url # github repository url
repoUrl = 'https://raw.github.com/Itseez/opencv/master' repoUrl = 'https://raw.github.com/opencv/opencv/master'
def get_sample(self, filename, iscolor = cv2.IMREAD_COLOR): def get_sample(self, filename, iscolor = cv2.IMREAD_COLOR):
if not filename in self.image_cache: if not filename in self.image_cache:

@ -2,7 +2,7 @@
// http://docs.opencv.org/doc/tutorials/calib3d/camera_calibration/camera_calibration.html // http://docs.opencv.org/doc/tutorials/calib3d/camera_calibration/camera_calibration.html
// //
// It uses standard OpenCV asymmetric circles grid pattern 11x4: // It uses standard OpenCV asymmetric circles grid pattern 11x4:
// https://github.com/Itseez/opencv/blob/2.4/doc/acircles_pattern.png. // https://github.com/opencv/opencv/blob/2.4/doc/acircles_pattern.png.
// The results are the camera matrix and 5 distortion coefficients. // The results are the camera matrix and 5 distortion coefficients.
// //
// Tap on highlighted pattern to capture pattern corners for calibration. // Tap on highlighted pattern to capture pattern corners for calibration.

@ -117,10 +117,10 @@ static void help()
"\tThis will detect only the face in image.jpg.\n"; "\tThis will detect only the face in image.jpg.\n";
cout << " \n\nThe classifiers for face and eyes can be downloaded from : " cout << " \n\nThe classifiers for face and eyes can be downloaded from : "
" \nhttps://github.com/Itseez/opencv/tree/master/data/haarcascades"; " \nhttps://github.com/opencv/opencv/tree/master/data/haarcascades";
cout << "\n\nThe classifiers for nose and mouth can be downloaded from : " cout << "\n\nThe classifiers for nose and mouth can be downloaded from : "
" \nhttps://github.com/Itseez/opencv_contrib/tree/master/modules/face/data/cascades\n"; " \nhttps://github.com/opencv/opencv_contrib/tree/master/modules/face/data/cascades\n";
} }
static void detectFaces(Mat& img, vector<Rect_<int> >& faces, string cascade_path) static void detectFaces(Mat& img, vector<Rect_<int> >& faces, string cascade_path)

@ -19,7 +19,7 @@
Online docs: http://docs.opencv.org Online docs: http://docs.opencv.org
Q&A forum: http://answers.opencv.org Q&A forum: http://answers.opencv.org
Issue tracker: http://code.opencv.org Issue tracker: http://code.opencv.org
GitHub: https://github.com/Itseez/opencv/ GitHub: https://github.com/opencv/opencv/
************************************************** */ ************************************************** */
#include "opencv2/calib3d/calib3d.hpp" #include "opencv2/calib3d/calib3d.hpp"

@ -15,7 +15,7 @@ if __name__ == "__main__":
im = cv.LoadImageM(fileName, False) im = cv.LoadImageM(fileName, False)
im3 = cv.LoadImageM(fileName, True) im3 = cv.LoadImageM(fileName, True)
except: # if local copy cannot be opened, try downloading it except: # if local copy cannot be opened, try downloading it
url = 'https://raw.github.com/Itseez/opencv/master/samples/cpp/left01.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/cpp/left01.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -11,7 +11,7 @@ def load_sample(name=None):
try: try:
img0 = cv.LoadImage(name, cv.CV_LOAD_IMAGE_COLOR) img0 = cv.LoadImage(name, cv.CV_LOAD_IMAGE_COLOR)
except IOError: except IOError:
urlbase = 'https://raw.github.com/Itseez/opencv/master/samples/c/' urlbase = 'https://raw.github.com/opencv/opencv/master/samples/c/'
file = name.split('/')[-1] file = name.split('/')[-1]
filedata = urllib2.urlopen(urlbase+file).read() filedata = urllib2.urlopen(urlbase+file).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)

@ -68,7 +68,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1: if len(sys.argv) > 1:
src_image = cv.GetMat(cv.LoadImage(sys.argv[1], 0)) src_image = cv.GetMat(cv.LoadImage(sys.argv[1], 0))
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/baboon.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/baboon.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -51,7 +51,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1: if len(sys.argv) > 1:
im = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_GRAYSCALE) im = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_GRAYSCALE)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/baboon.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/baboon.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -42,7 +42,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1: if len(sys.argv) > 1:
gray = cv.LoadImage(sys.argv[1], cv.CV_LOAD_IMAGE_GRAYSCALE) gray = cv.LoadImage(sys.argv[1], cv.CV_LOAD_IMAGE_GRAYSCALE)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/stuff.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/stuff.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -32,7 +32,7 @@ if __name__ == '__main__':
if len(sys.argv) > 1: if len(sys.argv) > 1:
im = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR) im = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/fruits.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/fruits.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -73,7 +73,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1: if len(sys.argv) > 1:
im = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR) im = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/fruits.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/fruits.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -82,7 +82,7 @@ if __name__ == '__main__':
if len(sys.argv) > 1: if len(sys.argv) > 1:
source_image = cv.LoadImage(sys.argv[1], cv.CV_LOAD_IMAGE_GRAYSCALE) source_image = cv.LoadImage(sys.argv[1], cv.CV_LOAD_IMAGE_GRAYSCALE)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/stuff.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/stuff.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -14,7 +14,7 @@ if __name__ == "__main__":
filename = sys.argv[1] filename = sys.argv[1]
src = cv.LoadImage(filename, cv.CV_LOAD_IMAGE_GRAYSCALE) src = cv.LoadImage(filename, cv.CV_LOAD_IMAGE_GRAYSCALE)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/cpp/building.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/cpp/building.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -27,7 +27,7 @@ if __name__=="__main__":
if len(sys.argv) > 1: if len(sys.argv) > 1:
img0 = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR) img0 = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/fruits.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/fruits.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -23,7 +23,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1: if len(sys.argv) > 1:
src = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR) src = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/fruits.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/fruits.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -31,7 +31,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1: if len(sys.argv) > 1:
src = cv.LoadImage(sys.argv[1], cv.CV_LOAD_IMAGE_COLOR) src = cv.LoadImage(sys.argv[1], cv.CV_LOAD_IMAGE_COLOR)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/fruits.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/fruits.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -22,7 +22,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1: if len(sys.argv) > 1:
img0 = cv.LoadImageM( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR) img0 = cv.LoadImageM( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/lena.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/lena.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

@ -27,7 +27,7 @@ if __name__ == "__main__":
if len(sys.argv) > 1: if len(sys.argv) > 1:
img0 = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR) img0 = cv.LoadImage( sys.argv[1], cv.CV_LOAD_IMAGE_COLOR)
else: else:
url = 'https://raw.github.com/Itseez/opencv/master/samples/c/fruits.jpg' url = 'https://raw.github.com/opencv/opencv/master/samples/c/fruits.jpg'
filedata = urllib2.urlopen(url).read() filedata = urllib2.urlopen(url).read()
imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1) imagefiledata = cv.CreateMatHeader(1, len(filedata), cv.CV_8UC1)
cv.SetData(imagefiledata, filedata, len(filedata)) cv.SetData(imagefiledata, filedata, len(filedata))

Loading…
Cancel
Save