Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 20 Aug 2018 16:29:39 +0000 (19:29 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 20 Aug 2018 16:30:18 +0000 (19:30 +0300)
commit7d4bb9428b31ad144cfdc8cafe26b5c37258d489
tree91dfe604c8e6e09a47b46dccb5d16490ff8d08d8
parent76eb38976103c86610f73d87e46b7cb5a74f0017
parent3c03fb56e0e99789e91496fd9138289b461e411a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
40 files changed:
doc/tutorials/core/basic_linear_transform/basic_linear_transform.markdown
doc/tutorials/core/discrete_fourier_transform/discrete_fourier_transform.markdown
doc/tutorials/core/file_input_output_with_xml_yml/file_input_output_with_xml_yml.markdown
doc/tutorials/core/how_to_scan_images/how_to_scan_images.markdown
doc/tutorials/core/how_to_use_OpenCV_parallel_for_/how_to_use_OpenCV_parallel_for_.markdown
doc/tutorials/core/how_to_use_ippa_conversion/how_to_use_ippa_conversion.markdown
doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.markdown
doc/tutorials/core/mat_the_basic_image_container/mat_the_basic_image_container.markdown
doc/tutorials/imgproc/basic_geometric_drawing/basic_geometric_drawing.markdown
doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.markdown
doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.markdown
doc/tutorials/imgproc/histograms/back_projection/back_projection.markdown
doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.markdown
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.markdown
doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.markdown
doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.markdown
doc/tutorials/imgproc/imgtrans/distance_transformation/distance_transform.markdown
doc/tutorials/imgproc/imgtrans/remap/remap.markdown
doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.markdown
doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.markdown
doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.markdown
doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.markdown
doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.markdown
doc/tutorials/imgproc/shapedescriptors/hull/hull.markdown
doc/tutorials/imgproc/shapedescriptors/moments/moments.markdown
doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.markdown
doc/tutorials/imgproc/threshold/threshold.markdown
doc/tutorials/imgproc/threshold_inRange/threshold_inRange.markdown
doc/tutorials/stitching/stitcher/stitcher.markdown
modules/calib3d/include/opencv2/calib3d.hpp
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/persistence.hpp
modules/highgui/include/opencv2/highgui.hpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/ml/include/opencv2/ml.hpp
modules/ml/src/data.cpp
modules/ml/test/test_mltests2.cpp
modules/objdetect/include/opencv2/objdetect.hpp
modules/photo/include/opencv2/photo.hpp