diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-08-26 18:31:41 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-08-26 18:31:41 +0000 |
| commit | 8cea87cc8bf443da489d037fd4cda19607675ffb (patch) | |
| tree | 5b0d0aef7376bb98bf5eafbe400a16d467ea54fe | |
| parent | 645c89e89760228f8cd8d49b0e5d0e4fe77674d6 (diff) | |
| parent | b138d759f5611a0b32a872e0d66347026c9047dd (diff) | |
| download | platform_external_dng_sdk-8cea87cc8bf443da489d037fd4cda19607675ffb.tar.gz platform_external_dng_sdk-8cea87cc8bf443da489d037fd4cda19607675ffb.tar.bz2 platform_external_dng_sdk-8cea87cc8bf443da489d037fd4cda19607675ffb.zip | |
Snap for 6792789 from b138d759f5611a0b32a872e0d66347026c9047dd to simpleperf-release
Change-Id: Ied598d346d5eec52883377f11d8eb6352d44616f
| -rw-r--r-- | source/dng_lossless_jpeg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/dng_lossless_jpeg.cpp b/source/dng_lossless_jpeg.cpp index e3b0576..9d0d01a 100644 --- a/source/dng_lossless_jpeg.cpp +++ b/source/dng_lossless_jpeg.cpp @@ -2277,7 +2277,7 @@ void dng_lossless_decoder::DecodeImage () #if qSupportHasselblad_3FR - if (info.Ss == 8) + if (info.Ss == 8 && (numCOL & 1) == 0) { fHasselblad3FR = true; @@ -2412,7 +2412,7 @@ void dng_lossless_decoder::DecodeImage () // For the rest of the column on this row, predictor // calculations are based on PSV. - if (compsInScan == 2 && info.Ss == 1) + if (compsInScan == 2 && info.Ss == 1 && numCOL > 1) { // This is the combination used by both the Canon and Kodak raw formats. |