diff options
| author | SzuWei Lin <szuweilin@google.com> | 2020-09-01 17:44:00 +0800 |
|---|---|---|
| committer | SzuWei Lin <szuweilin@google.com> | 2020-09-01 17:44:00 +0800 |
| commit | e53441f0f940933e70dc2b9159140e76cd2447ed (patch) | |
| tree | d2bd15857f5bff3e418772dffcfb6d6782663730 | |
| parent | f17914d62b7972114fff07dce701f1bedfb7786c (diff) | |
| parent | baf1c655b6b689978a8f7c649154f6a39d46904f (diff) | |
| download | dng_sdk-android10-gsi.tar.gz | |
Merge branch android10-qpr3-releaseandroid10-gsi
Change-Id: I69eaf1b4459a5103ce966fdd5c7df1c8ed4f61c2
| -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. |