[opencv] 161/251: Merge pull request #9237 from alalek:fix_winrt_build

[Nobuhiro Iwamatsu]

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

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

commit 402a77e7f75d33d7711ecee9e85f57fae22199a8
Merge: 2ca561f 1081cee
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Wed Jul 26 10:42:49 2017 +0000

    Merge pull request #9237 from alalek:fix_winrt_build

 3rdparty/openvx/hal/openvx_hal.cpp                 |  2 +-
 cmake/checks/cpu_neon.cpp                          |  2 +-
 .../core/include/opencv2/core/cv_cpu_dispatch.h    |  4 ++--
 modules/core/include/opencv2/core/cvdef.h          |  2 +-
 .../core/opencl/runtime/opencl_clamdblas.hpp       |  2 +-
 .../core/opencl/runtime/opencl_clamdfft.hpp        |  2 +-
 .../opencv2/core/opencl/runtime/opencl_core.hpp    |  2 +-
 modules/core/include/opencv2/core/types_c.h        |  4 ++--
 modules/core/src/alloc.cpp                         | 20 +++++++++---------
 modules/core/src/glob.cpp                          |  4 ++--
 modules/core/src/ocl_deprecated.hpp                |  2 +-
 modules/core/src/opengl.cpp                        |  2 +-
 modules/core/src/parallel.cpp                      |  4 ++--
 modules/core/src/precomp.hpp                       |  4 ++--
 modules/core/src/rand.cpp                          |  4 +---
 modules/core/src/system.cpp                        | 24 +++++++++++-----------
 modules/cudacodec/perf/perf_video.cpp              |  2 +-
 modules/cudacodec/src/ffmpeg_video_source.cpp      |  2 +-
 modules/cudacodec/src/precomp.hpp                  |  2 +-
 modules/cudacodec/src/thread.cpp                   |  4 ++--
 modules/cudacodec/src/video_writer.cpp             |  8 ++++----
 modules/cudacodec/test/test_video.cpp              |  4 ++--
 modules/flann/include/opencv2/flann/defines.h      |  2 +-
 modules/flann/include/opencv2/flann/dist.h         |  2 +-
 modules/flann/include/opencv2/flann/dummy.h        |  2 +-
 .../highgui/include/opencv2/highgui/highgui_c.h    |  2 +-
 modules/highgui/src/precomp.hpp                    |  2 +-
 modules/highgui/src/window_QT.cpp                  |  2 +-
 modules/highgui/src/window_gtk.cpp                 |  4 ++--
 modules/highgui/src/window_w32.cpp                 |  4 ++--
 modules/imgcodecs/src/grfmt_jpeg.cpp               |  4 ++--
 modules/imgcodecs/src/grfmt_jpeg2000.cpp           |  6 +++---
 modules/imgcodecs/src/grfmt_tiff.cpp               |  2 +-
 modules/imgcodecs/src/precomp.hpp                  |  2 +-
 modules/ts/src/ts.cpp                              | 14 ++++++-------
 modules/ts/src/ts_perf.cpp                         |  4 ++--
 modules/video/test/test_camshift.cpp               |  4 ++--
 modules/videoio/src/cap_cmu.cpp                    |  4 ++--
 modules/videoio/src/cap_dc1394.cpp                 |  2 +-
 modules/videoio/src/cap_dc1394_v2.cpp              |  4 ++--
 modules/videoio/src/cap_dshow.cpp                  |  2 +-
 modules/videoio/src/cap_ffmpeg.cpp                 |  8 ++++----
 modules/videoio/src/cap_ffmpeg_api.hpp             |  2 +-
 modules/videoio/src/cap_ffmpeg_impl.hpp            | 10 ++++-----
 modules/videoio/src/cap_giganetix.cpp              |  2 +-
 modules/videoio/src/cap_gphoto2.cpp                |  2 +-
 modules/videoio/src/cap_libv4l.cpp                 |  2 +-
 modules/videoio/src/cap_msmf.cpp                   |  2 +-
 modules/videoio/src/cap_pvapi.cpp                  |  8 ++++----
 modules/videoio/src/cap_v4l.cpp                    |  2 +-
 modules/videoio/src/cap_ximea.cpp                  |  8 ++++----
 modules/videoio/src/ffmpeg_codecs.hpp              |  2 +-
 modules/videoio/src/precomp.hpp                    |  2 +-
 platforms/winrt/setup_winrt.ps1                    | 12 +++++------
 samples/cpp/detect_mser.cpp                        |  2 +-
 samples/gpu/opengl.cpp                             |  5 +----
 samples/gpu/stereo_multi.cpp                       |  4 ++--
 samples/gpu/video_writer.cpp                       |  2 +-
 samples/opengl/opengl_interop.cpp                  | 18 ++++++++--------
 samples/opengl/winapp.hpp                          | 22 ++++++++++----------
 60 files changed, 142 insertions(+), 147 deletions(-)


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