generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1986 from GregoryMorse:patch-3

Browse Source
This commit is contained in:
Roman Donchenko
2014-03-18 16:18:32 +04:00
committed by OpenCV Buildbot
parent 6e44f05e6f 90920c2376
commit b70332d806
4 changed files with 10230 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/CMakeLists.txt
View File

@@ -9,6 +9,10 @@ ocv_add_module(highgui opencv_imgproc OPTIONAL opencv_androidcamera)
ocv_clear_vars(GRFMT_LIBS) 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) if(HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR)
ocv_include_directories(${ZLIB_INCLUDE_DIRS}) ocv_include_directories(${ZLIB_INCLUDE_DIRS})
list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES}) list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES})

783
modules/highgui/src/cap_msmf.cpp
View File

File diff suppressed because it is too large Load Diff

3187
modules/highgui/src/cap_msmf.hpp Normal file
View File

File diff suppressed because it is too large Load Diff

6326
modules/highgui/src/ppltasks_winrt.h Normal file
View File

File diff suppressed because it is too large Load Diff