Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 10 Nov 2018 20:10:57 +0000 (20:10 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 10 Nov 2018 20:50:26 +0000 (20:50 +0000)
commit1913482cf5d257d7da292bb2c15f22d0588d34dc
tree53668af48a887c747bb9b60b1853309e3fbd90c7
parentc7d04c6c5c571e12e8e4537e214bda353c71c550
parent56eebb926da3d64735454de94fb7cf28b726a7ef
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
54 files changed:
CMakeLists.txt
cmake/OpenCVUtils.cmake
doc/tutorials/core/how_to_scan_images/how_to_scan_images.markdown
modules/calib3d/src/calibinit.cpp
modules/core/CMakeLists.txt
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/private.hpp
modules/core/include/opencv2/core/utility.hpp
modules/core/src/arithm.cpp
modules/core/src/arithm.simd.hpp
modules/core/src/command_line_parser.cpp
modules/core/src/convert.cpp
modules/core/src/convert_scale.cpp
modules/core/src/lda.cpp
modules/core/src/lut.cpp
modules/core/src/matrix.cpp
modules/core/src/mean.cpp
modules/core/src/minmax.cpp
modules/core/src/ocl.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/core/src/umatrix.cpp
modules/core/test/test_mat.cpp
modules/dnn/src/dnn.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/features2d/src/fast.cpp
modules/imgcodecs/src/grfmt_bmp.cpp
modules/imgcodecs/src/grfmt_pam.cpp
modules/imgcodecs/src/grfmt_pxm.cpp
modules/imgcodecs/src/grfmt_sunras.cpp
modules/imgcodecs/src/loadsave.cpp
modules/imgproc/src/box_filter.cpp
modules/imgproc/src/contours.cpp
modules/imgproc/src/deriv.cpp
modules/imgproc/src/featureselect.cpp
modules/imgproc/src/histogram.cpp
modules/imgproc/src/imgwarp.cpp
modules/imgproc/src/median_blur.cpp
modules/imgproc/src/pyramids.cpp
modules/imgproc/src/smooth.cpp
modules/imgproc/src/thresh.cpp
modules/objdetect/include/opencv2/objdetect.hpp
modules/objdetect/src/detection_based_tracker.cpp
modules/objdetect/src/qrcode.cpp
modules/ts/include/opencv2/ts/ts_ext.hpp
modules/ts/src/ts_perf.cpp
modules/video/src/lkpyramid.cpp
modules/videoio/include/opencv2/videoio.hpp
modules/videoio/src/cap.cpp
modules/videoio/src/cap_dshow.cpp
modules/videoio/test/test_camera.cpp
samples/cpp/detect_blob.cpp
samples/cpp/detect_mser.cpp
samples/python/digits_video.py