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

Do not check the PlanarConfiguration field in the TIFFWriteCheck() function in

Browse Source 
case of single band images (as per TIFF spec).
This commit is contained in:
Andrey Kiselev 2005-07-21 13:57:00 +00:00
parent 3c4cbb4ee4
commit 42ffebf834
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libtiff/tif_write.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_write.c,v 1.17 2004-11-05 11:37:29 dron Exp $ */ /* $Id: tif_write.c,v 1.18 2005-07-21 13:57:00 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -516,12 +516,22 @@ TIFFWriteCheck(TIFF* tif, int tiles, const char* module)
tif->tif_name); tif->tif_name);
return (0); return (0);
} }
if (tif->tif_dir.td_samplesperpixel == 1) {
/*
* Planarconfiguration is irrelevant in case of single band
* images and need not be included. We will set it anyway,
* because this field is used in other parts of library even
* in the single band case.
*/
tif->tif_dir.td_planarconfig == PLANARCONFIG_CONTIG;
} else {
if (!TIFFFieldSet(tif, FIELD_PLANARCONFIG)) { if (!TIFFFieldSet(tif, FIELD_PLANARCONFIG)) {
TIFFError(module, TIFFError(module,
"%s: Must set \"PlanarConfiguration\" before writing data", "%s: Must set \"PlanarConfiguration\" before writing data",
tif->tif_name); tif->tif_name);
return (0); return (0);
} }
}
if (tif->tif_dir.td_stripoffset == NULL && !TIFFSetupStrips(tif)) { if (tif->tif_dir.td_stripoffset == NULL && !TIFFSetupStrips(tif)) {
tif->tif_dir.td_nstrips = 0; tif->tif_dir.td_nstrips = 0;
TIFFError(module, "%s: No space for %s arrays", TIFFError(module, "%s: No space for %s arrays",