diff options
| author | Bill Yi <byi@google.com> | 2020-07-07 07:26:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-07 07:26:19 +0000 |
| commit | b138d759f5611a0b32a872e0d66347026c9047dd (patch) | |
| tree | 5b0d0aef7376bb98bf5eafbe400a16d467ea54fe | |
| parent | 3ad1308e09dac73f5a95633e27ac519875c2e288 (diff) | |
| parent | 84de511df4f08157042517717a1162ecb2cf31ca (diff) | |
| download | dng_sdk-b138d759f5611a0b32a872e0d66347026c9047dd.tar.gz | |
Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: 84de511df4
Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1356363
Change-Id: Id88dd610ddd0e67099fbe5f276bce9d215b2e505
| -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. |