From 55a63ed11a696c2a51e8be66daf770116f845637 Mon Sep 17 00:00:00 2001 From: John Haddon Date: Thu, 21 Mar 2024 18:42:04 +0000 Subject: [PATCH] OpenEXR : Add DWA patches --- Changes.md | 4 +++- OpenEXR/patches/pull-1591.patch | 12 ++++++++++++ OpenEXR/patches/pull-1684.patch | 13 +++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 OpenEXR/patches/pull-1591.patch create mode 100644 OpenEXR/patches/pull-1684.patch diff --git a/Changes.md b/Changes.md index 89a9f47f2b..0912d1057c 100644 --- a/Changes.md +++ b/Changes.md @@ -1,7 +1,9 @@ 8.0.0 alpha x (relative to 8.0.0 alpha 8) ------------- - +- OpenEXR : Applied patches from the following pull requests : + - https://github.com/AcademySoftwareFoundation/openexr/pull/1591 + - https://github.com/AcademySoftwareFoundation/openexr/pull/1684 8.0.0 alpha 8 (relative to 8.0.0 alpha 7) ------------- diff --git a/OpenEXR/patches/pull-1591.patch b/OpenEXR/patches/pull-1591.patch new file mode 100644 index 0000000000..de2f318fe7 --- /dev/null +++ b/OpenEXR/patches/pull-1591.patch @@ -0,0 +1,12 @@ +diff --git a/src/lib/OpenEXRCore/internal_dwa_compressor.h b/src/lib/OpenEXRCore/internal_dwa_compressor.h +index 03ad60669..219cc3f3e 100644 +--- a/src/lib/OpenEXRCore/internal_dwa_compressor.h ++++ b/src/lib/OpenEXRCore/internal_dwa_compressor.h +@@ -1047,6 +1047,7 @@ DwaCompressor_uncompress ( + me->alloc_fn, me->free_fn, &(cd->_dctData), outBufferEnd); + if (rv != EXR_ERR_SUCCESS) return rv; + ++ cd->_dctData._type = chan->data_type; + outBufferEnd += chan->width * chan->bytes_per_element; + } + } diff --git a/OpenEXR/patches/pull-1684.patch b/OpenEXR/patches/pull-1684.patch new file mode 100644 index 0000000000..134aaf2284 --- /dev/null +++ b/OpenEXR/patches/pull-1684.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/OpenEXRCore/internal_dwa_compressor.h b/src/lib/OpenEXRCore/internal_dwa_compressor.h +index 705a036c5..f96d22b37 100644 +--- a/src/lib/OpenEXRCore/internal_dwa_compressor.h ++++ b/src/lib/OpenEXRCore/internal_dwa_compressor.h +@@ -1600,7 +1600,7 @@ DwaCompressor_classifyChannels (DwaCompressor* me) + prefixMap, + me->_numChannels, + curc->channel_name, +- (size_t) (curc->channel_name - suffix)); ++ (size_t) (suffix - curc->channel_name)); + + for (size_t i = 0; i < me->_channelRuleCount; ++i) + {