Applied feature #3375 and fix of pull 1842 to avoid merging problems later
authorStevenPuttemans <steven.puttemans@kuleuven.be>
Thu, 21 Nov 2013 15:45:48 +0000 (16:45 +0100)
committerStevenPuttemans <steven.puttemans@kuleuven.be>
Mon, 25 Nov 2013 09:53:03 +0000 (10:53 +0100)
commit6f892b10ff9e4ba91356889ebeca17e0a25b941d
tree33b6255dda47f7dac75008fbd789817643076f3b
parent70a4de20d74e23220269d011e2c5ca1c5198936c
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
57 files changed:
doc/opencv_cheatsheet.tex
doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.rst
doc/tutorials/features2d/feature_description/feature_description.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst
doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.rst
doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst
doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst
doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst
doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.rst
doc/tutorials/imgproc/histograms/back_projection/back_projection.rst
doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.rst
doc/tutorials/imgproc/histograms/template_matching/template_matching.rst
doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst
doc/tutorials/imgproc/imgtrans/copyMakeBorder/copyMakeBorder.rst
doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst
doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst
doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst
doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.rst
doc/tutorials/imgproc/imgtrans/remap/remap.rst
doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.rst
doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst
doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst
doc/tutorials/imgproc/pyramids/pyramids.rst
doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst
doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst
doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst
doc/tutorials/imgproc/shapedescriptors/hull/hull.rst
doc/tutorials/imgproc/shapedescriptors/moments/moments.rst
doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst
doc/tutorials/imgproc/threshold/threshold.rst
doc/tutorials/introduction/display_image/display_image.rst
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
doc/user_guide/ug_highgui.rst
modules/core/doc/basic_structures.rst
modules/gpu/doc/introduction.rst
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/highgui/doc/user_interface.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/objdetect/doc/cascade_classification.rst
platforms/android/android.toolchain.cmake
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py