commit f18c441f0f359697145daf1275c9ea8682e1a1aa
author android-build-team Robot <android-build-team-robot@google.com> Fri May 15 07:08:50 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 15 07:08:50 2020 +0000
tree d2bd15857f5bff3e418772dffcfb6d6782663730
parent 021f4f74994635d7739d637f206aca1949eadc0a
parent f0ff5a6b4659491e915abe941c7a194f06b09bec

Snap for 6497471 from f0ff5a6b4659491e915abe941c7a194f06b09bec to mainline-release

Change-Id: I16b86308adb45b3c759e87ad817b22b1aef0f495

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.