mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 03:10:57 +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>
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c7de889..2a58f19 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -743,6 +743,9 @@ ELSE()
|
|
FIND_PACKAGE(Inventor)
|
|
FIND_PACKAGE(Jasper)
|
|
FIND_PACKAGE(OpenEXR)
|
|
+ set(OPENEXR_FOUND "${OpenEXR_FOUND}")
|
|
+ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
|
|
+ set(OPENEXR_LIBRARIES_VARS OPENEXR_LIBRARIES)
|
|
FIND_PACKAGE(OpenCascade)
|
|
FIND_PACKAGE(COLLADA)
|
|
FIND_PACKAGE(FBX)
|
|
diff --git a/src/osgPlugins/exr/ReaderWriterEXR.cpp b/src/osgPlugins/exr/ReaderWriterEXR.cpp
|
|
index 7132e97..bea1483 100644
|
|
--- a/src/osgPlugins/exr/ReaderWriterEXR.cpp
|
|
+++ b/src/osgPlugins/exr/ReaderWriterEXR.cpp
|
|
@@ -41,11 +41,11 @@ public:
|
|
{
|
|
return _inStream->read(c,n).good();
|
|
};
|
|
- virtual Int64 tellg ()
|
|
+ virtual uint64_t tellg ()
|
|
{
|
|
return _inStream->tellg();
|
|
};
|
|
- virtual void seekg (Int64 pos)
|
|
+ virtual void seekg (uint64_t pos)
|
|
{
|
|
_inStream->seekg(pos);
|
|
};
|
|
@@ -69,11 +69,11 @@ public:
|
|
{
|
|
_outStream->write(c,n);
|
|
};
|
|
- virtual Int64 tellp ()
|
|
+ virtual uint64_t tellp ()
|
|
{
|
|
return _outStream->tellp();
|
|
};
|
|
- virtual void seekp (Int64 pos)
|
|
+ virtual void seekp (uint64_t pos)
|
|
{
|
|
_outStream->seekp(pos);
|
|
};
|