commit 63da0a76796c77106586c3f34822d3c67608dff0
author android-build-team Robot <android-build-team-robot@google.com> Fri May 15 01:05:27 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 15 01:05:27 2020 +0000
tree d2bd15857f5bff3e418772dffcfb6d6782663730
parent 021f4f74994635d7739d637f206aca1949eadc0a
parent 234929445c4609f8329b1d683a8d9052237f6fcd

Snap for 6496549 from 234929445c4609f8329b1d683a8d9052237f6fcd to rvc-release

Change-Id: Icc3d3a540725d593276a7746152bfa698c17d6aa

source/dng_lossless_jpeg.cpp

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 @@
 	
 	#if qSupportHasselblad_3FR
 	
-	if (info.Ss == 8)
+	if (info.Ss == 8 && (numCOL & 1) == 0)
 		{
 		
 		fHasselblad3FR = true;
@@ -2412,7 +2412,7 @@
         // 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.