diff options
| author | dron <dron> | 2007-07-09 10:15:37 +0000 |
|---|---|---|
| committer | dron <dron> | 2007-07-09 10:15:37 +0000 |
| commit | 66e66e97387bb38e3b959fd115f20a7f6e59059c (patch) | |
| tree | 6ffbe37490f073a8d97b6cce8dd2849b875ee2df /libtiff/tif_print.c | |
| parent | 241566a512217df19c1dac71c2527af314b98a87 (diff) | |
| download | libtiff-66e66e97387bb38e3b959fd115f20a7f6e59059c.tar.gz | |
More work on new tag extending scheme. Use the new scheme everywhere.
Diffstat (limited to 'libtiff/tif_print.c')
| -rw-r--r-- | libtiff/tif_print.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c index c0206b4f..64344781 100644 --- a/libtiff/tif_print.c +++ b/libtiff/tif_print.c @@ -1,4 +1,4 @@ -/* $Id: tif_print.c,v 1.45 2007-06-27 16:09:58 joris Exp $ */ +/* $Id: tif_print.c,v 1.46 2007-07-09 10:15:38 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -61,7 +61,7 @@ static const char *orientNames[] = { #define NORIENTNAMES (sizeof (orientNames) / sizeof (orientNames[0])) static void -_TIFFPrintField(FILE* fd, const TIFFFieldInfo *fip, +_TIFFPrintField(FILE* fd, const TIFFField *fip, uint32 value_count, void *raw_data) { uint32 j; @@ -500,7 +500,7 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) count = (short) TIFFGetTagListCount(tif); for(i = 0; i < count; i++) { uint32 tag = TIFFGetTagListEntry(tif, i); - const TIFFFieldInfo *fip; + const TIFFField *fip; uint32 value_count; int mem_alloc = 0; void *raw_data; @@ -545,11 +545,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) } } else { /* - * XXX: Should be fixed and removed, see the - * notes related to TIFFTAG_PAGENUMBER, + * XXX: Should be fixed and removed, + * see the notes related to + * TIFFTAG_PAGENUMBER, * TIFFTAG_HALFTONEHINTS, * TIFFTAG_YCBCRSUBSAMPLING and - * TIFFTAG_DOTRANGE tags in tif_dir.c. */ + * TIFFTAG_DOTRANGE tags in tif_dir.c. + */ char *tmp; raw_data = _TIFFmalloc( _TIFFDataSize(fip->field_type) @@ -565,10 +567,10 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) } /* - * Catch the tags which needs to be specially handled and - * pretty print them. If tag not handled in - * _TIFFPrettyPrintField() fall down and print it as any other - * tag. + * Catch the tags which needs to be specially handled + * and pretty print them. If tag not handled in + * _TIFFPrettyPrintField() fall down and print it as + * any other tag. */ if (_TIFFPrettyPrintField(tif, fd, tag, value_count, raw_data)) { if(mem_alloc) |