diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-15 02:08:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-15 02:08:49 +0000 |
| commit | eee8a203a90594970aa73473236e007c150daf96 (patch) | |
| tree | d2bd15857f5bff3e418772dffcfb6d6782663730 | |
| parent | 021f4f74994635d7739d637f206aca1949eadc0a (diff) | |
| parent | a3a89a2c0a7944b08389a6d358b60ac195711805 (diff) | |
| download | dng_sdk-eee8a203a90594970aa73473236e007c150daf96.tar.gz | |
Snap for 6496753 from a3a89a2c0a7944b08389a6d358b60ac195711805 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release
Change-Id: I5549bb45c7ad19ebfb9802629ff9efeace274c09
| -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. |