diff options
| author | fwarmerdam <fwarmerdam> | 2012-06-01 23:22:53 +0000 |
|---|---|---|
| committer | fwarmerdam <fwarmerdam> | 2012-06-01 23:22:53 +0000 |
| commit | b7b7e4bf452cfc09330c0cb25c7e83c134557fe3 (patch) | |
| tree | fba61fd6f2bf697606fc8154ca7e360c3d57e7fa | |
| parent | f50950efe6fbb2211957fc755d7c9c978f77a629 (diff) | |
| download | libtiff-b7b7e4bf452cfc09330c0cb25c7e83c134557fe3.tar.gz | |
avoid reading imagery with -D in EXIF directories
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | tools/tiffinfo.c | 8 |
2 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,7 @@ 2012-06-01 Frank Warmerdam <warmerdam@google.com> + * tools/tiffinfo.c: Do not try to read image data in EXIF directories. + * libtiff/tif_getimage.c: added support for _SEPARATED CMYK images. http://bugzilla.maptools.org/show_bug.cgi?id=2379 diff --git a/tools/tiffinfo.c b/tools/tiffinfo.c index cfec3fb3..dd8bc79f 100644 --- a/tools/tiffinfo.c +++ b/tools/tiffinfo.c @@ -1,4 +1,4 @@ -/* $Id: tiffinfo.c,v 1.19 2012-05-24 03:50:31 fwarmerdam Exp $ */ +/* $Id: tiffinfo.c,v 1.20 2012-06-01 23:22:54 fwarmerdam Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -150,8 +150,12 @@ main(int argc, char* argv[]) tiffinfo(tif, order, flags); if (TIFFGetField(tif, TIFFTAG_EXIFIFD, &offset)) { - if (TIFFReadEXIFDirectory(tif, offset)) + if (TIFFReadEXIFDirectory(tif, offset)) { + int old_readdata = readdata; + readdata = 0; tiffinfo(tif, order, flags); + readdata = old_readdata; + } } } while (TIFFReadDirectory(tif)); } |