cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid defaulting image->res_unit to INCH in loadImage()

Browse Source
This commit is contained in:
Frank Warmerdam 2009-02-06 15:43:06 +00:00
parent 21cfbd887b
commit 5d40e67e89
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-02-06 Frank Warmerdam <warmerdam@pobox.com>
* tools/tiffcrop.c: Don't default image->res_unit to INCH. Now the
test suite should pass.
2009-02-05 Frank Warmerdam <warmerdam@pobox.com> 2009-02-05 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tif_dirread.c: Re-incorporated a sanity check on tag size, * libtiff/tif_dirread.c: Re-incorporated a sanity check on tag size,

4
tools/tiffcrop.c
View File

@ -1,4 +1,4 @@
/* $Id: tiffcrop.c,v 1.11 2009-01-23 06:04:31 fwarmerdam Exp $ */ /* $Id: tiffcrop.c,v 1.12 2009-02-06 15:43:06 fwarmerdam Exp $ */
/* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of /* tiffcrop.c -- a port of tiffcp.c extended to include manipulations of
* the image data through additional options listed below * the image data through additional options listed below
@ -4966,7 +4966,7 @@ loadImage(TIFF* in, struct image_data *image, struct dump_opts * dump, unsigned
TIFFGetField(in, TIFFTAG_IMAGELENGTH, &length); TIFFGetField(in, TIFFTAG_IMAGELENGTH, &length);
TIFFGetField(in, TIFFTAG_XRESOLUTION, &xres); TIFFGetField(in, TIFFTAG_XRESOLUTION, &xres);
TIFFGetField(in, TIFFTAG_YRESOLUTION, &yres); TIFFGetField(in, TIFFTAG_YRESOLUTION, &yres);
TIFFGetFieldDefaulted(in, TIFFTAG_RESOLUTIONUNIT, &res_unit); TIFFGetField(in, TIFFTAG_RESOLUTIONUNIT, &res_unit);
scanlinesize = TIFFScanlineSize(in); scanlinesize = TIFFScanlineSize(in);
image->bps = bps; image->bps = bps;