liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '4c61b7d3c3eb8d474ab54a2221eeb1a059dcd67d' into libraw-copylib

Browse Source 
Upgrade LibRaw to snapshot 202403.
This commit is contained in:
Lawrence Lee
2024-04-13 22:47:37 -07:00
parent 51e52d9aba 4c61b7d3c3
commit ef0655a84d
133 changed files with 4307 additions and 1939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/libraw/GoPro/dng-sdk-1_6-1_7-hide-ccVc5-definitiion.diff Normal file
View File

@@ -0,0 +1,13 @@
--- a/gpr_sdk/private/gpr_read_image.cpp
+++ b/gpr_sdk/private/gpr_read_image.cpp
@@ -68,8 +68,10 @@ gpr_read_image::gpr_read_image( gpr_buffer_auto* vc5_buffer ) : _vc5_buffer(vc5_
}
#if GPR_WRITING || GPR_READING
+#if !defined(qDNG_1_6) && !defined(qDNGSupportJXL)
const int ccVc5 = 9; // Vc5 compression type
#endif
+#endif
void gpr_read_image::ReadTile (dng_host &host,
const dng_ifd &ifd,

29
rtengine/libraw/GoPro/gpr_read_image.cpp-dng16.diff Normal file
View File

@@ -0,0 +1,29 @@
--- gpr_read_image.cpp.orig 2019-08-30 12:20:00.326653300 +0300
+++ gpr_read_image.cpp 2019-08-31 10:43:26.568184100 +0300
@@ -67,6 +67,10 @@
fDecodeVC5 = true;
}
void gpr_read_image::ReadTile (dng_host &host,
const dng_ifd &ifd,
dng_stream &stream,
@@ -77,7 +81,8 @@
uint32 tileByteCount,
AutoPtr<dng_memory_block> &compressedBuffer,
AutoPtr<dng_memory_block> &uncompressedBuffer,
- AutoPtr<dng_memory_block> &subTileBlockBuffer)
+ AutoPtr<dng_memory_block> &subTileBlockBuffer,
+ bool usingMultipleThreads)
{
if( ifd.fCompression == ccVc5 )
@@ -122,7 +127,8 @@
tileByteCount,
compressedBuffer,
uncompressedBuffer,
- subTileBlockBuffer);
+ subTileBlockBuffer,
+ usingMultipleThreads);
}
}

17
rtengine/libraw/GoPro/gpr_read_image.cpp-dng17.diff Normal file
View File

@@ -0,0 +1,17 @@
diff --git a/gpr_sdk/private/gpr_read_image.cpp b/gpr_sdk/private/gpr_read_image.cpp
index c611b3f..4f8fe88 100644
--- a/gpr_sdk/private/gpr_read_image.cpp
+++ b/gpr_sdk/private/gpr_read_image.cpp
@@ -79,7 +81,12 @@ void gpr_read_image::ReadTile (dng_host &host,
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)

12
rtengine/libraw/GoPro/gpr_read_image.h-dng16.diff Normal file
View File

@@ -0,0 +1,12 @@
--- gpr_read_image.h.orig 2019-08-30 12:20:00.326653300 +0300
+++ gpr_read_image.h 2019-08-30 20:56:11.138246800 +0300
@@ -56,7 +56,8 @@
uint32 tileByteCount,
AutoPtr<dng_memory_block> &compressedBuffer,
AutoPtr<dng_memory_block> &uncompressedBuffer,
- AutoPtr<dng_memory_block> &subTileBlockBuffer);
+ AutoPtr<dng_memory_block> &subTileBlockBuffer,
+ bool usingMultipleThreads );
};
#endif // GPR_READING

17
rtengine/libraw/GoPro/gpr_read_image.h-dng17.diff Normal file
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 );