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

Added workaround for some software that may crash when last strip

Browse Source 
of image contains fewer number of scanlines than specified by the
`/Height' variable. See
http://bugzilla.remotesensing.org/show_bug.cgi?id=164 for explanation.
This commit is contained in:
Andrey Kiselev 2002-06-22 10:32:56 +00:00
parent b3f6ae5b8f
commit f2558c8426
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/tiff2ps.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiff2ps.c,v 1.8 2002-06-21 10:24:40 dron Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiff2ps.c,v 1.9 2002-06-22 10:32:56 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -825,7 +825,21 @@ PS_Lvl2ImageDict(FILE* fd, TIFF* tif, uint32 w, uint32 h)
fputs(" <<\n", fd); fputs(" <<\n", fd);
fputs(" /ImageType 1\n", fd); fputs(" /ImageType 1\n", fd);
fprintf(fd, " /Width %lu\n", (unsigned long) tile_width); fprintf(fd, " /Width %lu\n", (unsigned long) tile_width);
fprintf(fd, " /Height %lu\n", (unsigned long) tile_height); /*
* Workaround for some software that may crash when last strip
* of image contains fewer number of scanlines than specified
* by the `/Height' variable. So for stripped images with multiple
* strips we will set `/Height' as `im_h', because one is
* recalculated for each strip - including the (smaller) final strip.
* For tiled images and images with only one strip `/Height' will
* contain number of scanlines in tile (or image height in case of
* one-stripped image).
*/
if (TIFFIsTiled(tif) || tf_numberstrips == 1)
fprintf(fd, " /Height %lu\n", (unsigned long) tile_height);
else
fprintf(fd, " /Height im_h\n");
if (planarconfiguration == PLANARCONFIG_SEPARATE && samplesperpixel > 1) if (planarconfiguration == PLANARCONFIG_SEPARATE && samplesperpixel > 1)
fputs(" /MultipleDataSources true\n", fd); fputs(" /MultipleDataSources true\n", fd);
fprintf(fd, " /ImageMatrix [ %lu 0 0 %ld %s %s ]\n", fprintf(fd, " /ImageMatrix [ %lu 0 0 %ld %s %s ]\n",