tinyexr: Sync with upstream 1.0.1

Removes miniz as a bundled dependency, relies on our own zlib instead. Includes a couple commits ahead of `v1.0.1` tag to fix MinGW builds.
ObserverHerb · Nov 19, 2021 · 46d3eff · 46d3eff
1 parent a777f01
commit 46d3eff
Show file tree

Hide file tree

Showing 7 changed files with 2,105 additions and 7,359 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -400,7 +400,7 @@ License: Expat
 
 Files: ./thirdparty/tinyexr/
 Comment: TinyEXR
-Copyright: 2014-2020, Syoyo Fujita
+Copyright: 2014-2021, Syoyo Fujita
   2002, Industrial Light & Magic, a division of Lucas Digital Ltd. LLC
 License: BSD-3-clause
 

diff --git a/modules/tinyexr/SCsub b/modules/tinyexr/SCsub
@@ -20,6 +20,9 @@ env_tinyexr.Prepend(CPPPATH=[thirdparty_dir])
 
 # Enable threaded loading with C++11.
 env_tinyexr.Append(CPPDEFINES=["TINYEXR_USE_THREAD"])
+# miniz is an external dependency, we could add it but we can instead rely
+# on our existing bundled zlib.
+env_tinyexr.Append(CPPDEFINES=[("TINYEXR_USE_MINIZ", 0)])
 
 env_thirdparty = env_tinyexr.Clone()
 env_thirdparty.disable_warnings()

diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/modules/tinyexr/image_loader_tinyexr.cpp
@@ -33,6 +33,8 @@
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 
+#include <zlib.h> // Should come before including tinyexr.
+
 #include "thirdparty/tinyexr/tinyexr.h"
 
 Error ImageLoaderTinyEXR::load_image(Ref<Image> p_image, FileAccess *f, bool p_force_linear, float p_scale) {

diff --git a/modules/tinyexr/image_saver_tinyexr.cpp b/modules/tinyexr/image_saver_tinyexr.cpp
@@ -31,6 +31,8 @@
 #include "image_saver_tinyexr.h"
 #include "core/math/math_funcs.h"
 
+#include <zlib.h> // Should come before including tinyexr.
+
 #include "thirdparty/tinyexr/tinyexr.h"
 
 static bool is_supported_format(Image::Format p_format) {

diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -599,13 +599,16 @@ comments and a patch is provided in the squish/ folder.
 ## tinyexr
 
 - Upstream: https://github.com/syoyo/tinyexr
-- Version: 1.0.0 (e4b7840d9448b7d57a88384ce26143004f3c0c71, 2020)
+- Version: 1.0.1 (67010eae802211202d0797f4df2b809f4ba7442c, 2021)
 - License: BSD-3-Clause
 
 Files extracted from upstream source:
 
 - `tinyexr.{cc,h}`
 
+The `tinyexr.cc` file was modified to include `zlib.h` which we provide,
+instead of `miniz.h` as an external dependency.
+
 
 ## vhacd
 

diff --git a/thirdparty/tinyexr/tinyexr.cc b/thirdparty/tinyexr/tinyexr.cc
@@ -4,5 +4,9 @@
 #endif
 #endif
 
+// -- GODOT start --
+#include <zlib.h> // Should come before including tinyexr.
+// -- GODOT end --
+
 #define TINYEXR_IMPLEMENTATION
 #include "tinyexr.h"