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

Fixed problem with float tags reading; support for printing RATIONAL and BYTE

Browse Source 
tags added.
This commit is contained in:
Andrey Kiselev 2003-08-07 16:42:55 +00:00
parent 3f7ebdb05c
commit e8e205be49
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libtiff/tif_print.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_print.c,v 1.11 2003-07-26 03:50:53 warmerda Exp $ */ /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_print.c,v 1.12 2003-08-07 16:42:55 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -520,9 +520,18 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
for( j = 0; j < value_count; j++ ) for( j = 0; j < value_count; j++ )
{ {
if( fld->field_type == TIFF_SHORT ) if( fld->field_type == TIFF_BYTE )
fprintf( fd, "%d",
(int) ((char *) raw_data)[j] );
else if( fld->field_type == TIFF_SHORT )
fprintf( fd, "%d", fprintf( fd, "%d",
(int) ((short *) raw_data)[j] ); (int) ((short *) raw_data)[j] );
else if( fld->field_type == TIFF_LONG )
fprintf( fd, "%d",
(int) ((long *) raw_data)[j] );
else if( fld->field_type == TIFF_RATIONAL )
fprintf( fd, "%f",
((float *) raw_data)[j] );
else if( fld->field_type == TIFF_ASCII ) else if( fld->field_type == TIFF_ASCII )
{ {
fprintf( fd, "%s", fprintf( fd, "%s",
@ -534,10 +543,7 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags)
((double *) raw_data)[j] ); ((double *) raw_data)[j] );
else if( fld->field_type == TIFF_FLOAT ) else if( fld->field_type == TIFF_FLOAT )
fprintf( fd, "%f", fprintf( fd, "%f",
(float) ((double *) raw_data)[j] ); ((float *) raw_data)[j] );
else if( fld->field_type == TIFF_LONG )
fprintf( fd, "%d",
(int) ((long *) raw_data)[j] );
else else
{ {
fprintf( fd, fprintf( fd,