libtiff: Back out accidental commit of a working copy.

https://github.com/libsdl-org/libtiff/commit/0b6e46201b984c0a38cc2fd59964135cc66a9c9e

From 0b6e46201b984c0a38cc2fd59964135cc66a9c9e Mon Sep 17 00:00:00 2001
From: Bob Friesenhahn <[EMAIL REDACTED]>
Date: Fri, 11 Jun 2010 20:43:19 +0000
Subject: [PATCH] Back out accidental commit of a working copy.

---
 tools/tiffcp.c | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/tools/tiffcp.c b/tools/tiffcp.c
index f8230cbe..24985e85 100644
--- a/tools/tiffcp.c
+++ b/tools/tiffcp.c
@@ -1,4 +1,4 @@
-/* $Id: tiffcp.c,v 1.37.2.6 2010-06-10 22:52:45 bfriesen Exp $ */
+/* $Id: tiffcp.c,v 1.37.2.7 2010-06-11 20:43:19 bfriesen Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -558,34 +558,17 @@ tiffcp(TIFF* in, TIFF* out)
 	copyFunc cf;
 	uint32 width, length;
 	struct cpTag* p;
-	uint16 input_compression, input_photometric;
 
 	CopyField(TIFFTAG_IMAGEWIDTH, width);
 	CopyField(TIFFTAG_IMAGELENGTH, length);
 	CopyField(TIFFTAG_BITSPERSAMPLE, bitspersample);
 	CopyField(TIFFTAG_SAMPLESPERPIXEL, samplesperpixel);
-
-	/*
-	  For OJPEG we need to read the subsampled YCbCr data as upsampled
-	  RGB.  Since we don't write OJPEG format, automatically convert OJPEG
-	  format to modern JPEG format.
-	*/
-#if 1
-	if (TIFFGetField(in, TIFFTAG_COMPRESSION, &input_compression)
-	    && input_compression == COMPRESSION_OJPEG) {
-		TIFFSetField(in, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
-
-		if (compression == (uint16)-1)
-			compression=COMPRESSION_JPEG;
-	}
-#endif
-
 	if (compression != (uint16)-1)
 		TIFFSetField(out, TIFFTAG_COMPRESSION, compression);
 	else
 		CopyField(TIFFTAG_COMPRESSION, compression);
-	
 	if (compression == COMPRESSION_JPEG) {
+	    uint16 input_compression, input_photometric;
 
             if (TIFFGetField(in, TIFFTAG_COMPRESSION, &input_compression)
                  && input_compression == COMPRESSION_JPEG) {
@@ -611,7 +594,6 @@ tiffcp(TIFF* in, TIFF* out)
 			PHOTOMETRIC_LOGL : PHOTOMETRIC_LOGLUV);
 	else
 		CopyTag(TIFFTAG_PHOTOMETRIC, 1, TIFF_SHORT);
-
 	if (fillorder != 0)
 		TIFFSetField(out, TIFFTAG_FILLORDER, fillorder);
 	else