cwebp/tiff: use the first image directory

tiffdec does not support and warns about multi-directory images.
previously, the code would read all the directories and thus attempt to
use the last rather than the first as the message suggests.

Change-Id: I3a10c778e6e924a3df75b41c26a9c03afb761044
This commit is contained in:
James Zern 2012-12-15 18:43:36 -08:00
parent df7aa07605
commit bd0025579f

View File

@ -26,18 +26,17 @@ int ReadTIFF(const char* const filename,
uint32 width, height;
uint32* raster;
int ok = 0;
int dircount = 1;
tdir_t dircount;
if (tif == NULL) {
fprintf(stderr, "Error! Cannot open TIFF file '%s'\n", filename);
return 0;
}
while (TIFFReadDirectory(tif)) ++dircount;
dircount = TIFFNumberOfDirectories(tif);
if (dircount > 1) {
fprintf(stderr, "Warning: multi-directory TIFF files are not supported.\n"
"Only the first will be used, %d will be ignored.\n",
"Only the first will be used, %hu will be ignored.\n",
dircount - 1);
}