diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-17 21:10:41 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-17 21:10:41 +0000 |
| commit | baf1c655b6b689978a8f7c649154f6a39d46904f (patch) | |
| tree | d2bd15857f5bff3e418772dffcfb6d6782663730 | |
| parent | 021f4f74994635d7739d637f206aca1949eadc0a (diff) | |
| parent | 2e8f1f0dc5ca3db8a7035938752dd230608e17ab (diff) | |
| download | dng_sdk-baf1c655b6b689978a8f7c649154f6a39d46904f.tar.gz | |
Merge cherrypicks of [11520371, 11520372, 11521176, 11521177, 11520373, 11520374, 11521196, 11521216, 11520730, 11521236, 11520430, 11521256, 11521276, 11520277, 11520278] into qt-qpr3-releaseandroid-10.0.0_r41android-10.0.0_r40android10-qpr3-release
Change-Id: I76e197d1b55ff1812ee8650a2a716d65f59526d5
| -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. |