potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #28: add openexr to 3rdparty libs

Browse Source
This commit is contained in:
Andrey Kamaev
2012-09-03 16:03:25 +04:00
parent 11b403900e 52581750fc
commit 6ee7ecb617
213 changed files with 95053 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/CMakeLists.txt
+2 -2
View File
@@ -39,9 +39,9 @@ if(WITH_JASPER)
list(APPEND GRFMT_LIBS ${JASPER_LIBRARIES})
endif()
if(WITH_OPENEXR AND OPENEXR_FOUND)
if(WITH_OPENEXR)
add_definitions(-DHAVE_OPENEXR)
ocv_include_directories(${OPENEXR_INCLUDE_PATHS})
include_directories(SYSTEM ${OPENEXR_INCLUDE_PATHS})
list(APPEND GRFMT_LIBS ${OPENEXR_LIBRARIES})
endif()
modules/highgui/src/grfmt_exr.cpp
+5 -6
View File
@@ -44,6 +44,10 @@
#ifdef HAVE_OPENEXR
#if defined _MSC_VER && _MSC_VER >= 1200
# pragma warning( disable: 4100 4244 4267 )
#endif
#include <ImfHeader.h>
#include <ImfInputFile.h>
#include <ImfOutputFile.h>
@@ -52,12 +56,7 @@
#include <half.h>
#include "grfmt_exr.hpp"
#if defined _MSC_VER && _MSC_VER >= 1200
#pragma comment(lib, "Half.lib")
#pragma comment(lib, "Iex.lib")
#pragma comment(lib, "IlmImf.lib")
#pragma comment(lib, "IlmThread.lib")
#pragma comment(lib, "Imath.lib")
#if defined _WIN32
#undef UINT
#define UINT ((Imf::PixelType)0)