Merge commit '4c61b7d3c3eb8d474ab54a2221eeb1a059dcd67d' into libraw-copylib

Upgrade LibRaw to snapshot 202403.
This commit is contained in:
Lawrence Lee
2024-04-13 22:47:37 -07:00
133 changed files with 4307 additions and 1939 deletions

View File

@@ -0,0 +1,17 @@
diff --git a/gpr_sdk/private/gpr_read_image.h b/gpr_sdk/private/gpr_read_image.h
index 159310b..f7d3ce1 100644
--- a/gpr_sdk/private/gpr_read_image.h
+++ b/gpr_sdk/private/gpr_read_image.h
@@ -54,7 +54,12 @@ public:
uint32 plane,
uint32 planes,
uint32 tileByteCount,
+// DNG 1.7 detection
+#ifdef qDNGSupportJXL
+ std::shared_ptr<dng_memory_block> &compressedBuffer,
+#else
AutoPtr<dng_memory_block> &compressedBuffer,
+#endif
AutoPtr<dng_memory_block> &uncompressedBuffer,
AutoPtr<dng_memory_block> &subTileBlockBuffer,
bool usingMultipleThreads );