Merge commit '638ecc4cde79b0296f2e04f683ca4cb881c28f36' as 'rtengine/libraw'

This commit is contained in:
Lawrence Lee
2023-11-12 11:49:00 -08:00
213 changed files with 77043 additions and 0 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/RawSpeed/DngDecoder.cpp b/RawSpeed/DngDecoder.cpp
index 56c701b..98f2474 100644
--- a/RawSpeed/DngDecoder.cpp
+++ b/RawSpeed/DngDecoder.cpp
@@ -216,7 +216,7 @@ RawImage DngDecoder::decodeRawInternal() {
if (bps != 8 && bps != 16)
big_endian = true;
try {
- readUncompressedRaw(in, size, pos, width*bps / 8, bps, big_endian ? BitOrder_Jpeg : BitOrder_Plain);
+ readUncompressedRaw(in, size, pos, mRaw->getCpp()*width*bps / 8, bps, big_endian ? BitOrder_Jpeg : BitOrder_Plain);
} catch(IOException &ex) {
if (i > 0)
mRaw->setError(ex.what());