Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 14 Sep 2018 21:52:21 +0000 (00:52 +0300)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Sep 2018 23:44:35 +0000 (23:44 +0000)
commit808ba552c532408bddd5fe51784cf4209296448a
treef4bf0e3f313a2504b59d671eb96215ab541e568b
parenta024593fa6e600b5f86578094aa9d9d8e5dabf50
parent14b438317e3845399f925bcd30c2008f00365f9a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
53 files changed:
CMakeLists.txt
modules/calib3d/src/calibinit.cpp
modules/calib3d/src/chessboard.cpp
modules/core/include/opencv2/core/private.hpp
modules/core/src/arithm.cpp
modules/core/src/array.cpp
modules/core/src/convert.cpp
modules/core/src/convert_scale.cpp
modules/core/src/count_non_zero.cpp
modules/core/src/lda.cpp
modules/core/src/lut.cpp
modules/core/src/merge.cpp
modules/core/src/norm.cpp
modules/core/src/ocl.cpp
modules/core/src/opengl.cpp
modules/core/src/parallel.cpp
modules/core/src/persistence_cpp.cpp
modules/core/src/rand.cpp
modules/core/src/split.cpp
modules/core/src/utils/filesystem.cpp
modules/core/test/test_arithm.cpp
modules/dnn/include/opencv2/dnn/dict.hpp
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/dnn/include/opencv2/dnn/dnn.inl.hpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/nms.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_common.hpp
modules/features2d/src/fast.cpp
modules/highgui/src/window.cpp
modules/imgproc/src/canny.cpp
modules/imgproc/src/color_rgb.cpp
modules/imgproc/src/corner.cpp
modules/imgproc/src/deriv.cpp
modules/imgproc/src/drawing.cpp
modules/imgproc/src/featureselect.cpp
modules/imgproc/src/generalized_hough.cpp
modules/imgproc/src/imgwarp.cpp
modules/imgproc/src/pyramids.cpp
modules/imgproc/src/smooth.cpp
modules/imgproc/src/templmatch.cpp
modules/imgproc/src/thresh.cpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/detection_based_tracker.cpp
modules/photo/src/denoising.cpp
modules/photo/src/inpaint.cpp
modules/python/src2/cv2.cpp
modules/shape/src/aff_trans.cpp
modules/stitching/src/matchers.cpp
modules/video/src/lkpyramid.cpp
modules/videoio/src/cap.cpp
modules/videostab/src/inpainting.cpp