diff options
| author | Bill Yi <byi@google.com> | 2020-07-06 21:37:18 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2020-07-07 04:49:04 +0000 |
| commit | 84de511df4f08157042517717a1162ecb2cf31ca (patch) | |
| tree | 5b0d0aef7376bb98bf5eafbe400a16d467ea54fe | |
| parent | 3ad1308e09dac73f5a95633e27ac519875c2e288 (diff) | |
| parent | baf1c655b6b689978a8f7c649154f6a39d46904f (diff) | |
| download | dng_sdk-84de511df4f08157042517717a1162ecb2cf31ca.tar.gz | |
Merge android10-qpr3-release to aosp-master - DO NOT MERGEandroid-r-beta-3android-r-beta-2
Change-Id: If3da1da3581e3bb66d6ce6472684c2dcf3504eca
| -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. |