Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 22 May 2020 19:06:42 +0000 (19:06 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 22 May 2020 19:50:14 +0000 (19:50 +0000)
commit21e28adb8745ba51b33a7d04a1bbabf3a2acd5f9
tree86f46d49f0af3621abd150e810628f4bf7957244
parente96a58f09124bb5ae22cfa036c91c24e1d767f63
parenta9b030591bf88d39ee9322bd705d8f171dbbed6d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
49 files changed:
doc/tutorials/calib3d/camera_calibration/camera_calibration.markdown
doc/tutorials/calib3d/camera_calibration_pattern/camera_calibration_pattern.markdown
doc/tutorials/dnn/dnn_android/dnn_android.markdown
doc/tutorials/dnn/dnn_custom_layers/dnn_custom_layers.md
doc/tutorials/dnn/dnn_googlenet/dnn_googlenet.markdown
doc/tutorials/dnn/dnn_halide/dnn_halide.markdown
doc/tutorials/dnn/dnn_yolo/dnn_yolo.markdown
doc/tutorials/features2d/akaze_matching/akaze_matching.markdown
doc/tutorials/features2d/feature_description/feature_description.markdown
doc/tutorials/features2d/feature_detection/feature_detection.markdown
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.markdown
doc/tutorials/features2d/feature_homography/feature_homography.markdown
doc/tutorials/features2d/homography/homography.markdown
doc/tutorials/features2d/trackingmotion/corner_subpixels/corner_subpixels.markdown
doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.markdown
doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.markdown
doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.markdown
doc/tutorials/gpu/gpu-basics-similarity/gpu_basics_similarity.markdown
doc/tutorials/gpu/gpu-thrust-interop/gpu_thrust_interop.markdown
doc/tutorials/introduction/android_binary_package/O4A_SDK.markdown
doc/tutorials/introduction/android_binary_package/android_dev_intro.markdown
doc/tutorials/introduction/android_binary_package/android_ocl_intro.markdown
doc/tutorials/introduction/clojure_dev_intro/clojure_dev_intro.markdown
doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
doc/tutorials/introduction/display_image/display_image.markdown
doc/tutorials/introduction/linux_install/linux_install.markdown
doc/tutorials/introduction/transition_guide/transition_guide.markdown
doc/tutorials/introduction/windows_visual_studio_opencv/windows_visual_studio_opencv.markdown
doc/tutorials/ml/introduction_to_pca/introduction_to_pca.markdown
doc/tutorials/ml/introduction_to_svm/introduction_to_svm.markdown
doc/tutorials/ml/non_linear_svms/non_linear_svms.markdown
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.markdown
doc/tutorials/objdetect/traincascade.markdown
doc/tutorials/video/background_subtraction/background_subtraction.markdown
doc/tutorials/video/meanshift/meanshift.markdown
doc/tutorials/video/optical_flow/optical_flow.markdown
doc/tutorials/videoio/intelperc.markdown
doc/tutorials/videoio/kinect_openni.markdown
doc/tutorials/videoio/video-input-psnr-ssim/video_input_psnr_ssim.markdown
doc/tutorials/videoio/video-write/video_write.markdown
modules/dnn/include/opencv2/dnn/all_layers.hpp
modules/dnn/src/caffe/caffe_importer.cpp
modules/dnn/src/init.cpp
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/flow_warp_layer.cpp
modules/dnn/src/layers/resize_layer.cpp
modules/dnn/src/layers/scale_layer.cpp
modules/dnn/test/test_layers.cpp
modules/videoio/src/cap_avfoundation.mm