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

do not override planar config if set (#2057)

Browse Source
This commit is contained in:
Frank Warmerdam 2009-06-03 23:47:22 +00:00
parent b4c7ba76a2
commit 5e895a5ce0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-06-03 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tif_write.c: do not override the planar configuration to be
contig for one sample files if planar configuration is already set.
http://bugzilla.maptools.org/show_bug.cgi?id=2057
2009-06-02 Frank Warmerdam <warmerdam@pobox.com> 2009-06-02 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/libtiff.def: Add TIFFUnsetField. * libtiff/libtiff.def: Add TIFFUnsetField.

5
libtiff/tif_write.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_write.c,v 1.33 2008-12-30 00:39:22 bfriesen Exp $ */ /* $Id: tif_write.c,v 1.34 2009-06-03 23:47:22 fwarmerdam Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -521,7 +521,8 @@ TIFFWriteCheck(TIFF* tif, int tiles, const char* module)
* because this field is used in other parts of library even * because this field is used in other parts of library even
* in the single band case. * in the single band case.
*/ */
tif->tif_dir.td_planarconfig = PLANARCONFIG_CONTIG; if (!TIFFFieldSet(tif, FIELD_PLANARCONFIG))
tif->tif_dir.td_planarconfig = PLANARCONFIG_CONTIG;
} else { } else {
if (!TIFFFieldSet(tif, FIELD_PLANARCONFIG)) { if (!TIFFFieldSet(tif, FIELD_PLANARCONFIG)) {
TIFFErrorExt(tif->tif_clientdata, module, TIFFErrorExt(tif->tif_clientdata, module,