[opencv] 36/89: Merge pull request #7689 from alalek:warnings_2.4

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.

commit af8e6b06f7021b5a3e474468a671c71471f2e9a7
Merge: 7b13550 0a543c5
Author: Vadim Pisarevsky <vadim.pisarevsky at gmail.com>
Date:   Tue Nov 22 13:30:25 2016 +0000

    Merge pull request #7689 from alalek:warnings_2.4

 3rdparty/libtiff/CMakeLists.txt                    |  4 ++--
 3rdparty/openexr/CMakeLists.txt                    |  4 ++--
 apps/haartraining/createsamples.cpp                |  5 +++++
 cmake/OpenCVCompilerOptions.cmake                  |  1 +
 modules/calib3d/src/calibinit.cpp                  |  4 +++-
 modules/calib3d/test/test_cameracalibration.cpp    |  2 ++
 modules/core/include/opencv2/core/cuda_devptrs.hpp | 23 +++++++++-------------
 modules/core/include/opencv2/core/gpumat.hpp       |  7 +++----
 modules/core/include/opencv2/core/internal.hpp     |  2 +-
 modules/core/include/opencv2/core/types_c.h        |  9 +++++++++
 modules/core/src/gpumat.cpp                        |  2 +-
 modules/core/src/system.cpp                        |  9 +++++++++
 modules/core/test/test_ds.cpp                      |  2 +-
 modules/flann/include/opencv2/flann/any.h          |  2 +-
 modules/flann/include/opencv2/flann/flann.hpp      | 23 ++++++++++++----------
 modules/gpu/include/opencv2/gpu/gpu.hpp            | 10 ++++++++++
 modules/highgui/src/cap_v4l.cpp                    | 11 +++++------
 modules/legacy/test/test_optflow.cpp               | 11 +++++++----
 modules/legacy/test/test_stereomatching.cpp        |  4 +++-
 modules/ocl/src/mssegmentation.cpp                 | 11 ++---------
 modules/ocl/test/utility.hpp                       |  2 +-
 modules/stitching/src/matchers.cpp                 |  1 +
 modules/ts/include/opencv2/ts/gpu_test.hpp         |  2 +-
 modules/ts/include/opencv2/ts/ts_gtest.h           |  4 ++--
 modules/ts/src/ts_func.cpp                         |  4 ++--
 25 files changed, 96 insertions(+), 63 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git