summaryrefslogtreecommitdiff
path: root/tools/tiff2rgba.c
diff options
context:
space:
mode:
authorAndrey Kiselev <dron@ak4719.spb.edu>2003-03-12 14:05:05 +0000
committerAndrey Kiselev <dron@ak4719.spb.edu>2003-03-12 14:05:05 +0000
commitc26da710494883bef7943d3752a113bf6a550e00 (patch)
tree3389544a97bc04fc1f5bfb683f57f10af5d6c300 /tools/tiff2rgba.c
parentd8cd741e3bb5d7139589ccde2e3c395e229a152e (diff)
downloadlibtiff-git-c26da710494883bef7943d3752a113bf6a550e00.tar.gz
Added library version reporting to all tools.
Diffstat (limited to 'tools/tiff2rgba.c')
-rw-r--r--tools/tiff2rgba.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/tools/tiff2rgba.c b/tools/tiff2rgba.c
index 208ffaf5..7d3e3b36 100644
--- a/tools/tiff2rgba.c
+++ b/tools/tiff2rgba.c
@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiff2rgba.c,v 1.5 2001-08-11 03:13:59 warmerda Exp $ */
+/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiff2rgba.c,v 1.6 2003-03-12 14:05:06 dron Exp $ */
/*
* Copyright (c) 1991-1997 Sam Leffler
@@ -46,7 +46,7 @@ int no_alpha = 0;
static int tiffcvt(TIFF* in, TIFF* out);
-static void usage(void);
+static void usage(int code);
int
main(int argc, char* argv[])
@@ -74,7 +74,7 @@ main(int argc, char* argv[])
else if (streq(optarg, "zip"))
compression = COMPRESSION_DEFLATE;
else
- usage();
+ usage(-1);
break;
case 'r':
@@ -90,12 +90,12 @@ main(int argc, char* argv[])
break;
case '?':
- usage();
+ usage(0);
/*NOTREACHED*/
}
if (argc - optind < 2)
- usage();
+ usage(-1);
out = TIFFOpen(argv[argc-1], "w");
if (out == NULL)
@@ -473,7 +473,7 @@ tiffcvt(TIFF* in, TIFF* out)
return( cvt_whole_image( in, out ) );
}
-static char* usageMsg[] = {
+static char* stuff[] = {
"usage: tiff2rgba [-c comp] [-r rows] [-b] input... output\n",
"where comp is one of the following compression algorithms:\n",
" jpeg\t\tJPEG encoding\n",
@@ -490,10 +490,14 @@ static char* usageMsg[] = {
};
static void
-usage(void)
+usage(int code)
{
+ char buf[BUFSIZ];
int i;
- for (i = 0; usageMsg[i]; i++)
- fprintf(stderr, "%s", usageMsg[i]);
- exit(-1);
+
+ setbuf(stderr, buf);
+ fprintf(stderr, "%s\n\n", TIFFGetVersion());
+ for (i = 0; stuff[i] != NULL; i++)
+ fprintf(stderr, "%s\n", stuff[i]);
+ exit(code);
}