commit 84de511df4f08157042517717a1162ecb2cf31ca
author Bill Yi <byi@google.com> Mon Jul 06 21:37:18 2020 -0700
committer Bill Yi <byi@google.com> Tue Jul 07 04:49:04 2020 +0000
tree 5b0d0aef7376bb98bf5eafbe400a16d467ea54fe
parent 3ad1308e09dac73f5a95633e27ac519875c2e288
parent baf1c655b6b689978a8f7c649154f6a39d46904f

Merge android10-qpr3-release to aosp-master - DO NOT MERGE

Change-Id: If3da1da3581e3bb66d6ce6472684c2dcf3504eca

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.