tinyexr: Sync with upstream 1.0.0

ObserverHerb · Sep 9, 2020 · fa35f53 · fa35f53
1 parent 6247f60
commit fa35f53
Show file tree

Hide file tree

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

diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -564,7 +564,7 @@ comments and a patch is provided in the squish/ folder.
 ## tinyexr
 
 - Upstream: https://github.com/syoyo/tinyexr
-- Version: git (4dbd05a22f51a2d7462311569b8b0cba0bbe2ac5, 2020)
+- Version: 1.0.0 (e4b7840d9448b7d57a88384ce26143004f3c0c71, 2020)
 - License: BSD-3-Clause
 
 Files extracted from upstream source:

diff --git a/thirdparty/tinyexr/tinyexr.cc b/thirdparty/tinyexr/tinyexr.cc
@@ -1,2 +1,8 @@
+#if defined(_WIN32)
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#endif
+
 #define TINYEXR_IMPLEMENTATION
 #include "tinyexr.h"