Squashed 'rtengine/libraw/' content from commit cccb97647
git-subtree-dir: rtengine/libraw git-subtree-split: cccb97647fcee56801fa68231fa8a38aa8b52ef7
This commit is contained in:
21
GoPro/dng-sdk-1_4-allow-VC5-validate.diff
Normal file
21
GoPro/dng-sdk-1_4-allow-VC5-validate.diff
Normal file
@@ -0,0 +1,21 @@
|
||||
diff --git a/source/dng_ifd.cpp b/source/dng_ifd.cpp
|
||||
index 174f18f..2974323 100644
|
||||
--- a/source/dng_ifd.cpp
|
||||
+++ b/source/dng_ifd.cpp
|
||||
@@ -3168,6 +3168,7 @@ bool dng_ifd::IsValidDNG (dng_shared &shared,
|
||||
case ccUncompressed:
|
||||
break;
|
||||
|
||||
+ case 9: /* VC5 compression support */
|
||||
case ccJPEG:
|
||||
{
|
||||
|
||||
@@ -3202,7 +3203,7 @@ bool dng_ifd::IsValidDNG (dng_shared &shared,
|
||||
break;
|
||||
|
||||
}
|
||||
-
|
||||
+
|
||||
case ccLossyJPEG:
|
||||
{
|
||||
|
15
GoPro/dng-sdk-1_6-hide-ccVc5-definitiion.diff
Normal file
15
GoPro/dng-sdk-1_6-hide-ccVc5-definitiion.diff
Normal file
@@ -0,0 +1,15 @@
|
||||
diff --git a/gpr_sdk/private/gpr_read_image.cpp b/gpr_sdk/private/gpr_read_image.cpp
|
||||
index c611b3f..9200a5b 100644
|
||||
--- 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
|
||||
+#ifndef qDNG_1_6
|
||||
const int ccVc5 = 9; // Vc5 compression type
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
void gpr_read_image::ReadTile (dng_host &host,
|
||||
const dng_ifd &ifd,
|
21
GoPro/dng-sdk-allow-VC5-validate.diff
Normal file
21
GoPro/dng-sdk-allow-VC5-validate.diff
Normal file
@@ -0,0 +1,21 @@
|
||||
diff --git a/source/dng_ifd.cpp b/source/dng_ifd.cpp
|
||||
index 174f18f..2974323 100644
|
||||
--- a/source/dng_ifd.cpp
|
||||
+++ b/source/dng_ifd.cpp
|
||||
@@ -3168,6 +3168,7 @@ bool dng_ifd::IsValidDNG (dng_shared &shared,
|
||||
case ccUncompressed:
|
||||
break;
|
||||
|
||||
+ case 9: /* VC5 compression support */
|
||||
case ccJPEG:
|
||||
{
|
||||
|
||||
@@ -3202,7 +3203,7 @@ bool dng_ifd::IsValidDNG (dng_shared &shared,
|
||||
break;
|
||||
|
||||
}
|
||||
-
|
||||
+
|
||||
case ccLossyJPEG:
|
||||
{
|
||||
|
29
GoPro/gpr_read_image.cpp.diff
Normal file
29
GoPro/gpr_read_image.cpp.diff
Normal 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);
|
||||
}
|
||||
}
|
||||
|
12
GoPro/gpr_read_image.h.diff
Normal file
12
GoPro/gpr_read_image.h.diff
Normal 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
|
Reference in New Issue
Block a user