diff options
author | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2008-12-31 03:06:27 +0000 |
---|---|---|
committer | Bob Friesenhahn <bfriesen@simple.dallas.tx.us> | 2008-12-31 03:06:27 +0000 |
commit | 968401fdf3a334747f92fd22e1131b213d734bac (patch) | |
tree | a093f3c45e1b44630161589c0107aaa319d666aa /contrib/iptcutil | |
parent | f44e64263432b74215a835f6b503077a68ce46b0 (diff) | |
download | libtiff-git-968401fdf3a334747f92fd22e1131b213d734bac.tar.gz |
* tools/{tiff2pdf.c, tiff2ps.c, tiffinfo.c}: Offset and length
tags now require 64-bit parameter rather than 32-bit.
* libtiff/tif_dirread.c: Fixed issues with unaligned access to
64-bit values.
Diffstat (limited to 'contrib/iptcutil')
-rw-r--r-- | contrib/iptcutil/iptcutil.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/iptcutil/iptcutil.c b/contrib/iptcutil/iptcutil.c index 29103e7a..3a960f5b 100644 --- a/contrib/iptcutil/iptcutil.c +++ b/contrib/iptcutil/iptcutil.c @@ -1,4 +1,4 @@ -/* $Id: iptcutil.c,v 1.5 2008-05-24 02:14:13 fwarmerdam Exp $ */ +/* $Id: iptcutil.c,v 1.6 2008-12-31 03:06:27 bfriesen Exp $ */ #include "tif_config.h" @@ -335,12 +335,12 @@ char *super_fgets(char *b, int *blen, FILE *file) c=fgetc(file); if (c == EOF || c == '\n') break; - if (((int)q - (int)b + 1 ) >= (int) len) + if (((long)q - (long)b + 1 ) >= (long) len) { - int + long tlen; - tlen=(int)q-(int)b; + tlen=(long)q-(long)b; len<<=1; b=(char *) realloc((char *) b,(len+2)); if ((char *) b == (char *) NULL) @@ -355,7 +355,7 @@ char *super_fgets(char *b, int *blen, FILE *file) int tlen; - tlen=(int)q - (int)b; + tlen=(long)q - (long)b; if (tlen == 0) return (char *) NULL; b[tlen] = '\0'; @@ -388,7 +388,7 @@ int main(int argc, char *argv[]) if( argc < 2 ) { - printf(usage); + puts(usage); return 1; } @@ -447,7 +447,7 @@ int main(int argc, char *argv[]) } else { - printf(usage); + puts(usage); return 1; } } |