aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Nichols <nezticle@gmail.com>2024-03-04 09:31:32 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-03-05 11:27:03 +0000
commit78edc39e31c6f6520d5446d9dc023be25722f8b0 (patch)
tree243d5c1db3aa03a4d58c479157197324b46e77cc
parent0e1fb3d581e56e1872992d7231a14e569c07644d (diff)
Update to tinyexr v1.0.8
Fixes: QTBUG-122921 Pick-to: 6.6 6.5 Change-Id: I5fe694f270537890ddc7a503a678001ca43bdb09 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> (cherry picked from commit e96659c9c6f17dc0b7aeaa2846a48b021fd0edaf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/3rdparty/tinyexr/qt_attribution.json4
-rw-r--r--src/3rdparty/tinyexr/tinyexr.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/tinyexr/qt_attribution.json b/src/3rdparty/tinyexr/qt_attribution.json
index b4f53f4b..a6c08f5d 100644
--- a/src/3rdparty/tinyexr/qt_attribution.json
+++ b/src/3rdparty/tinyexr/qt_attribution.json
@@ -7,8 +7,8 @@
"SecurityCritical": true,
"Homepage": "https://github.com/syoyo/tinyexr",
- "Version": "v1.0.7",
- "DownloadLocation": "https://github.com/syoyo/tinyexr/releases/tag/v1.0.7",
+ "Version": "v1.0.8",
+ "DownloadLocation": "https://github.com/syoyo/tinyexr/releases/tag/v1.0.8",
"License": "BSD 3-clause \"New\" or \"Revised\" License",
"LicenseId": "BSD-3-Clause",
diff --git a/src/3rdparty/tinyexr/tinyexr.h b/src/3rdparty/tinyexr/tinyexr.h
index d34ab633..d4001575 100644
--- a/src/3rdparty/tinyexr/tinyexr.h
+++ b/src/3rdparty/tinyexr/tinyexr.h
@@ -386,7 +386,7 @@ extern int IsEXRFromMemory(const unsigned char *memory, size_t size);
// error
extern int SaveEXRToMemory(const float *data, const int width, const int height,
const int components, const int save_as_fp16,
- const unsigned char **buffer, const char **err);
+ unsigned char **buffer, const char **err);
// @deprecated { Not recommended, but handy to use. }
// Saves single-frame OpenEXR image to a buffer. Assume EXR image contains RGB(A) channels.
@@ -9008,7 +9008,7 @@ int LoadEXRMultipartImageFromFile(EXRImage *exr_images,
}
int SaveEXRToMemory(const float *data, int width, int height, int components,
- const int save_as_fp16, const unsigned char **outbuf, const char **err) {
+ const int save_as_fp16, unsigned char **outbuf, const char **err) {
if ((components == 1) || components == 3 || components == 4) {
// OK