Merge pull request #2047 from GregoryMorse:patch-4

ccaedaed · Vadim Pisarevsky · c5de129c · b9d5f3f6 · ccaedaed · ccaedaed
Commit ccaedaed authored Sep 17, 2014 by Vadim Pisarevsky
5 changed files
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -9,6 +9,10 @@ ocv_add_module(highgui opencv_imgproc OPTIONAL opencv_androidcamera)

 ocv_clear_vars(GRFMT_LIBS)

+if(HAVE_WINRT_CX)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
+endif()
+
 if(HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR)
  ocv_include_directories(${ZLIB_INCLUDE_DIR})
  list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES})

--- a/modules/highgui/src/agile_wrl.h
+++ b/modules/highgui/src/agile_wrl.h
--- a/modules/highgui/src/cap_msmf.cpp
+++ b/modules/highgui/src/cap_msmf.cpp
--- a/modules/highgui/src/cap_msmf.hpp
+++ b/modules/highgui/src/cap_msmf.hpp
--- a/modules/highgui/src/ppltasks_winrt.h
+++ b/modules/highgui/src/ppltasks_winrt.h