libtiff: * libtiff/tif_jpeg.c: Fix regression with 3 band image caused by

https://github.com/libsdl-org/libtiff/commit/af9694b76c370d9c39e1a21498caa89d85c52e64

From af9694b76c370d9c39e1a21498caa89d85c52e64 Mon Sep 17 00:00:00 2001
From: Lee Howard <[EMAIL REDACTED]>
Date: Tue, 4 Jan 2011 02:42:45 +0000
Subject: [PATCH]         * libtiff/tif_jpeg.c: Fix regression with 3 band
 image caused by         commit on 2010-12-14 submitted by e-mail from        
 Even Rouault <even.rouault@mines-paris.org>

---
 ChangeLog          | 6 ++++++
 libtiff/tif_jpeg.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ddb920c..1fbac28e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-03  Lee Howard <faxguy@howardsilvan.com>
+
+	* libtiff/tif_jpeg.c: Fix regression with 3 band image caused by
+	commit on 2010-12-14 submitted by e-mail from 
+	Even Rouault <even.rouault@mines-paris.org>
+
 2010-12-31  Olivier Paquet  <olivier.paquet@gmail.com>
 
 	* libtiff/tif_dirread.c: Allow reading directories where
diff --git a/libtiff/tif_jpeg.c b/libtiff/tif_jpeg.c
index 051eba1b..3abeb6b2 100644
--- a/libtiff/tif_jpeg.c
+++ b/libtiff/tif_jpeg.c
@@ -1,4 +1,4 @@
-/* $Id: tif_jpeg.c,v 1.50.2.15 2010-12-14 23:59:42 faxguy Exp $ */
+/* $Id: tif_jpeg.c,v 1.50.2.16 2011-01-04 02:42:46 faxguy Exp $ */
 
 /*
  * Copyright (c) 1994-1997 Sam Leffler
@@ -1366,7 +1366,7 @@ JPEGPreEncode(TIFF* tif, tsample_t s)
 				sp->cinfo.c.in_color_space = JCS_CMYK;
 			else
 				sp->cinfo.c.in_color_space = JCS_UNKNOWN;
-			if (!TIFFjpeg_set_colorspace(sp, (sp->cinfo.c.in_color_space == JCS_RGB) ? JCS_YCbCr : sp->cinfo.c.in_color_space))
+			if (!TIFFjpeg_set_colorspace(sp, sp->cinfo.c.in_color_space))
 				return (0);
 			/* jpeg_set_colorspace set all sampling factors to 1 */
 		}