mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 11:59:02 +08:00
ca1501f4b2
Co-authored-by: Howard Su <howard0su@gmail.com> Co-authored-by: Nick Logozzo <nlogozzo225@gmail.com> Co-authored-by: sidy3d <sidy3d@users.noreply.github.com> Co-authored-by: c8ef <c8ef@outlook.com> Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com> Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Lily Wang <v-lilywang@microsoft.com> Co-authored-by: Matthias Kuhn <matthias@opengis.ch> Co-authored-by: Mark Harmstone <mark@harmstone.com> Co-authored-by: Kai Pastor <dg0yt@darc.de> Co-authored-by: Alexandre Bique <bique.alexandre@gmail.com> Co-authored-by: Peter Adam Korodi <52385411+kp-cat@users.noreply.github.com> Co-authored-by: Jakub Melka <mgr.jakub.melka@gmail.com> Co-authored-by: LE GARREC Vincent <github@le-garrec.fr> Co-authored-by: Josh Harris <126129571+harris-josh@users.noreply.github.com> Co-authored-by: Theodore Tsirpanis <theodore.tsirpanis@tiledb.com> Co-authored-by: Kaoru <shiinasama2001@gmail.com> Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com> Co-authored-by: Javier Matos <javiermatos@Javiers-Laptop.local> Co-authored-by: Pravila <pravila0011@gmail.com> Co-authored-by: JacobBarthelmeh <jacob@wolfssl.com> Co-authored-by: myd7349 <myd7349@gmail.com> Co-authored-by: Billy O'Neal <bion@microsoft.com> Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Co-authored-by: 王太阳 <wangfangkai@qq.com> Co-authored-by: 王方凯 <fk.wang@hydro-tech.cn> Co-authored-by: Chuck Walbourn <walbourn@users.noreply.github.com> Co-authored-by: Jaap Aarts <JAicewizard@users.noreply.github.com>
27 lines
802 B
Diff
27 lines
802 B
Diff
--- 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)
|
|
--- 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"
|
|
|