diff options
| author | fwarmerdam <fwarmerdam> | 2012-06-01 22:47:01 +0000 |
|---|---|---|
| committer | fwarmerdam <fwarmerdam> | 2012-06-01 22:47:01 +0000 |
| commit | 520d03f1a364b8e8698871166214e990f2f07a1f (patch) | |
| tree | 038c16d8bb8735db26bcb8680e6c6812520e0109 | |
| parent | c72428a8fa89173d82cbfe1160a0f79b69fac650 (diff) | |
| download | libtiff-520d03f1a364b8e8698871166214e990f2f07a1f.tar.gz | |
Avoid generic handling of TIFFTAG_WHITELEVEL (#2321)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libtiff/tif_dir.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -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 { |