Merge pull request #7854 from alalek:backports_2016
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 15 Dec 2016 16:09:44 +0000 (18:09 +0200)
committerGitHub <noreply@github.com>
Thu, 15 Dec 2016 16:09:44 +0000 (18:09 +0200)
commitcc09f5a7de4147b461cccea15bb9d8d2270611c9
treef045d6e0080fe9239c0bfc81db6db6a933bcce60
parent49e6bb2993326ba20f964c752a4d9c3ccf1c0ae8
Merge pull request #7854 from alalek:backports_2016

(2.4) Backports from master branch (#7854)
61 files changed:
3rdparty/libjasper/CMakeLists.txt
3rdparty/libjasper/jas_cm.c
3rdparty/libjasper/jas_stream.c
3rdparty/libjpeg/CMakeLists.txt
3rdparty/libpng/CMakeLists.txt
3rdparty/libtiff/CMakeLists.txt
3rdparty/openexr/CMakeLists.txt
3rdparty/tbb/CMakeLists.txt
3rdparty/zlib/CMakeLists.txt
apps/CMakeLists.txt
apps/haartraining/CMakeLists.txt
apps/traincascade/CMakeLists.txt
apps/version/CMakeLists.txt [new file with mode: 0644]
apps/version/opencv_version.cpp [new file with mode: 0644]
cmake/OpenCVModule.cmake
cmake/OpenCVUtils.cmake
modules/calib3d/src/calibration.cpp
modules/calib3d/src/fisheye.cpp
modules/contrib/src/basicretinafilter.cpp
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/magnoretinafilter.cpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.cpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.cpp
modules/contrib/src/retinacolor.hpp
modules/contrib/src/retinafilter.cpp
modules/contrib/src/stereovar.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/arithm.cpp
modules/core/src/drawing.cpp
modules/core/test/test_countnonzero.cpp
modules/gpu/CMakeLists.txt
modules/highgui/src/cap_avfoundation_mac.mm
modules/highgui/src/cap_dc1394.cpp
modules/highgui/src/grfmt_jpeg2000.cpp
modules/java/CMakeLists.txt
modules/java/generator/src/java/android+JavaCameraView.java
modules/ml/include/opencv2/ml/ml.hpp
modules/nonfree/src/surf_ocl.cpp
modules/ocl/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/bgfg_mog.cpp
modules/ocl/src/cl_runtime/cl_runtime_opencl_impl.hpp
modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
modules/ocl/src/cl_runtime/generator/common.py
modules/ocl/src/haar.cpp
modules/python/src2/cv2.cpp
modules/python/src2/hdr_parser.py
modules/stitching/CMakeLists.txt
modules/stitching/include/opencv2/stitching/stitcher.hpp
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/ts_gtest.cpp
modules/video/test/test_tvl1optflow.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vtk/vtkCloudMatSource.cpp
samples/cpp/stitching_detailed.cpp
samples/ocl/stereo_match.cpp