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

Properly handle TIFFTAG_PAGENUMBER, TIFFTAG_HALFTONEHINTS,

Browse Source 
TIFFTAG_YCBCRSUBSAMPLING, TIFFTAG_DOTRANGE which should be set by value.
This commit is contained in:
Andrey Kiselev 2010-07-06 14:30:38 +00:00
parent 1cf8becfc2
commit 897e7e9491
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2010-07-06 Andrey Kiselev <dron@ak4719.spb.edu> 2010-07-06 Andrey Kiselev <dron@ak4719.spb.edu>
* tools/tiffset.c: Properly handle TIFFTAG_PAGENUMBER,
TIFFTAG_HALFTONEHINTS, TIFFTAG_YCBCRSUBSAMPLING, TIFFTAG_DOTRANGE
which should be set by value.
* libtiff/tif_dirinfo.c: Don't use assertions in _TIFFFieldWithTag() * libtiff/tif_dirinfo.c: Don't use assertions in _TIFFFieldWithTag()
and _TIFFFieldWithName() if the tag is not found in the tag table. and _TIFFFieldWithName() if the tag is not found in the tag table.
This should be normal situation and returned NULL value should be This should be normal situation and returned NULL value should be

38
tools/tiffset.c
View File

@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
* $Id: tiffset.c,v 1.14 2010-03-10 18:56:50 bfriesen Exp $ * $Id: tiffset.c,v 1.15 2010-07-06 14:30:38 dron Exp $
* *
* Project: libtiff tools * Project: libtiff tools
* Purpose: Mainline for setting metadata in existing TIFF files. * Purpose: Mainline for setting metadata in existing TIFF files.
@ -27,27 +27,6 @@
* LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE. * OF THIS SOFTWARE.
****************************************************************************** ******************************************************************************
*
* $Log: tiffset.c,v $
* Revision 1.14 2010-03-10 18:56:50 bfriesen
* * libtiff/tif_aux.c (_TIFFCheckRealloc): Improve error message so
* that it is clearly a memory allocation error message, and also
* includes the size of the allocation request.
*
* Revision 1.13 2008/01/01 15:46:28 fwarmerdam
* Changes to reflect the fact that TIFFFieldWithTag() and TIFFFieldWithName()
* now return TIFFField pointers instead of TIFFFieldInfo pointers.
*
* Revision 1.12 2007/02/24 17:14:14 dron
* Properly handle tags with TIFF_VARIABLE writecount. As per bug
* http://bugzilla.remotesensing.org/show_bug.cgi?id=1350
*
* Revision 1.11 2005/09/13 14:13:42 dron
* Avoid warnings.
*
* Revision 1.10 2005/02/24 14:47:11 fwarmerdam
* Updated header.
*
*/ */
@ -86,7 +65,7 @@ GetField(TIFF *tiff, const char *tagname)
fip = TIFFFieldWithName(tiff, tagname); fip = TIFFFieldWithName(tiff, tagname);
if (!fip) { if (!fip) {
fprintf( stderr, "Field name %s not recognised.\n", tagname ); fprintf( stderr, "Field name \"%s\" is not recognised.\n", tagname );
return (TIFFField *)NULL; return (TIFFField *)NULL;
} }
@ -230,7 +209,18 @@ main(int argc, char* argv[])
if (fip->field_passcount) { if (fip->field_passcount) {
ret = TIFFSetField(tiff, fip->field_tag, ret = TIFFSetField(tiff, fip->field_tag,
wc, array); wc, array);
} else { } else if (fip->field_tag == TIFFTAG_PAGENUMBER
|| fip->field_tag == TIFFTAG_HALFTONEHINTS
|| fip->field_tag == TIFFTAG_YCBCRSUBSAMPLING
|| fip->field_tag == TIFFTAG_DOTRANGE) {
if (fip->field_type == TIFF_BYTE) {
ret = TIFFSetField(tiff, fip->field_tag,
((uint8 *)array)[0], ((uint8 *)array)[1]);
} else if (fip->field_type == TIFF_SHORT) {
ret = TIFFSetField(tiff, fip->field_tag,
((uint16 *)array)[0], ((uint16 *)array)[1]);
}
} else {
ret = TIFFSetField(tiff, fip->field_tag, ret = TIFFSetField(tiff, fip->field_tag,
array); array);
} }