libtiff: Avoid generic handling of TIFFTAG_WHITELEVEL (#2321)

https://github.com/libsdl-org/libtiff/commit/92b08ca51a176160520d9aab39a1eb18a9c0182d

From 92b08ca51a176160520d9aab39a1eb18a9c0182d Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <[EMAIL REDACTED]>
Date: Fri, 1 Jun 2012 22:47:01 +0000
Subject: [PATCH] Avoid generic handling of TIFFTAG_WHITELEVEL (#2321)

---
 ChangeLog         | 5 +++++
 libtiff/tif_dir.c | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0059f127..58b5804a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-01  Frank Warmerdam  <warmerdam@google.com>
+
+	* libtiff/tif_dir.c: Avoid generic handling of TIFFTAG_WHITELEVEL.
+	http://bugzilla.maptools.org/show_bug.cgi?id=2321
+
 2012-05-19  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* man/TIFFGetField.3tiff: Correct the 'count' field type in the
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c
index 335ee58f..07c2d913 100644
--- a/libtiff/tif_dir.c
+++ b/libtiff/tif_dir.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dir.c,v 1.75.2.6 2010-07-02 09:49:23 dron Exp $ */
+/* $Id: tif_dir.c,v 1.75.2.7 2012-06-01 22:47:02 fwarmerdam Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -502,7 +502,8 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap)
 		    && fip->field_tag != TIFFTAG_PAGENUMBER
 		    && fip->field_tag != TIFFTAG_HALFTONEHINTS
 		    && fip->field_tag != TIFFTAG_YCBCRSUBSAMPLING
-		    && fip->field_tag != TIFFTAG_DOTRANGE) {
+		    && fip->field_tag != TIFFTAG_DOTRANGE
+		    && fip->field_tag != TIFFTAG_WHITELEVEL) {
                     _TIFFmemcpy(tv->value, va_arg(ap, void *),
 				tv->count * tv_size);
 		} else {