mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 20:54:14 +08:00
94b089b7c1
* Update to 3.1.5 * Add feature 'tools' * ilmbase is now imath * [theia] Use openimageio cmake config * [freeimage] Use OpenEXR 3 and Imath * [opencv4] Use upstream's OpenEXR 3 support * [opencv3] Use upstream's OpenEXR 3 support * [opencv2] Use OpenEXR 3 and Imath * [osg] Use OpenEXR 3 * [openvdb] Use Imath, enable OpenEXR * [pangolin] Use OpenEXR 3 * [directxtex] Use OpenEXR 3 * [uvatlas] Disable /guard:ehcont when directxtex uses openexr * Update versions Co-authored-by: chausner <chausner@users.noreply.github.com>
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
|
|
index 9b43066..c1cc11f 100644
|
|
--- a/cmake/OpenCVFindLibsGrfmt.cmake
|
|
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
|
|
@@ -151,7 +151,12 @@ if(WITH_OPENEXR)
|
|
if(BUILD_OPENEXR)
|
|
ocv_clear_vars(OPENEXR_FOUND)
|
|
else()
|
|
- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
|
|
+ find_package(Imath CONFIG REQUIRED)
|
|
+ find_package(OpenEXR CONFIG REQUIRED)
|
|
+ set(OPENEXR_LIBRARIES Imath::Imath OpenEXR::OpenEXR)
|
|
+ set(OPENEXR_INCLUDE_PATHS "")
|
|
+ set(OPENEXR_VERSION "${OpenEXR_VERSION}")
|
|
+ set(OPENEXR_FOUND 1)
|
|
endif()
|
|
|
|
if(NOT OPENEXR_FOUND)
|
|
diff --git a/modules/highgui/src/grfmt_exr.cpp b/modules/highgui/src/grfmt_exr.cpp
|
|
index 399e586..b8cd270 100644
|
|
--- a/modules/highgui/src/grfmt_exr.cpp
|
|
+++ b/modules/highgui/src/grfmt_exr.cpp
|
|
@@ -57,6 +57,7 @@
|
|
#include <ImfOutputFile.h>
|
|
#include <ImfChannelList.h>
|
|
#include <ImfStandardAttributes.h>
|
|
+#include <ImfFrameBuffer.h>
|
|
#include <half.h>
|
|
#include "grfmt_exr.hpp"
|
|
|