Update OpenEXR to 3.1.9 and fix deprecation warnings

overte-org · Oct 2, 2023 · 9c0faf6 · 9c0faf6
1 parent 145326f
commit 9c0faf6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -51,7 +51,7 @@ def requirements(self):
         self.requires("libnode/18.17.1@overte/stable")
         self.requires("nlohmann_json/3.11.2")
         self.requires("nvidia-texture-tools/2023.01@overte/stable")
-        self.requires("openexr/2.5.7")
+        self.requires("openexr/3.1.9")
         self.requires("openssl/1.1.1w")
         self.requires("openvr/1.26.7@overte/stable")
         self.requires("opus/1.4")

diff --git a/libraries/image/src/image/OpenEXRReader.cpp b/libraries/image/src/image/OpenEXRReader.cpp
@@ -23,6 +23,7 @@
 #include <OpenEXR/ImfRgbaFile.h>
 #include <OpenEXR/ImfArray.h>
 #include <OpenEXR/ImfTestFile.h>
+#include <OpenEXR/ImfInt64.h>
 
 class QIODeviceImfStream : public Imf::IStream {
 public:
@@ -39,11 +40,11 @@ class QIODeviceImfStream : public Imf::IStream {
         return true;
     }
 
-    Imf::Int64 tellg() override {
+    uint64_t tellg() override {
         return _device.pos();
     }
 
-    void seekg(Imf::Int64 pos) override {
+    void seekg(uint64_t pos) override {
         _device.seek(pos);
     }