From 9fa6984f2274c863b0e6e86132d15d5837f974cb Mon Sep 17 00:00:00 2001 From: Kimball Thurston Date: Fri, 22 Mar 2024 12:22:34 +1300 Subject: [PATCH 1/2] fix rebase commit id (#1685) rebase and merge actually ran rebase and generated a new commit id Signed-off-by: Kimball Thurston --- .git-blame-ignore-revs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 65cd308835..29e6868e15 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -7,4 +7,4 @@ # initial clang-format run 2a24ae77ab94f4c06b102eba73feb52e2f90cb46 # clang-format run 17-Mar-2024 -36182929aec96dcf478495be00bd1b137a927847 +84f58b85aef7a7844f0d3bfb1301e778eb22e42c From bfbdccb48269ce7d45199098406e3d9743d55b77 Mon Sep 17 00:00:00 2001 From: Kimball Thurston Date: Fri, 22 Mar 2024 12:23:28 +1300 Subject: [PATCH 2/2] Fix typo causing prefix len to be wrong (#1684) When constructing the decompress side of dwaa/b compression support, simple typo when computing the prefix length as distance between pointers causing the length to be wrong, triggering csc decompression values to be wrong when decompressed. Signed-off-by: Kimball Thurston --- src/lib/OpenEXRCore/internal_dwa_compressor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/OpenEXRCore/internal_dwa_compressor.h b/src/lib/OpenEXRCore/internal_dwa_compressor.h index 705a036c59..f96d22b377 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) {