From d234e74582d3a604c9697d8ded6ccd9fa3243ddd Mon Sep 17 00:00:00 2001 From: Andrey Kiselev Date: Thu, 9 Oct 2003 08:38:18 +0000 Subject: [PATCH] Alpha file support removed. --- libtiff/mkversion.c | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/libtiff/mkversion.c b/libtiff/mkversion.c index c5539f65..9f4644f7 100644 --- a/libtiff/mkversion.c +++ b/libtiff/mkversion.c @@ -1,4 +1,4 @@ -/* "$Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/mkversion.c,v 1.5 2003-05-11 19:55:06 dron Exp $ */ +/* "$Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/mkversion.c,v 1.6 2003-10-09 08:38:18 dron Exp $ */ /* * Copyright (c) 1995-1997 Sam Leffler @@ -31,7 +31,7 @@ * * This was written by Peter Greenham for Acorn systems. * - * Syntax: mkversion [-v version-file] [-a alpha-file] [] + * Syntax: mkversion [-v version-file] [] */ #include #include @@ -41,7 +41,7 @@ static void usage(void) { fprintf(stderr, - "usage: mkversion [-v version-file] [-a alpha-file]\n" + "usage: mkversion [-v version-file]\n" " [-r releasedate-file] [outfile]\n"); exit(-1); } @@ -63,11 +63,9 @@ main(int argc, char* argv[]) { char* versionFile = "../VERSION"; char* releaseDateFile = "../RELEASE-DATE"; - char* alphaFile = "../dist/tiff.alpha"; char version[128]; char rawReleaseDate[128]; char tiffLibVersion[128]; - char alpha[128]; FILE* fd; char* cp; @@ -78,11 +76,6 @@ main(int argc, char* argv[]) usage(); argc--, argv++; versionFile = argv[0]; - } else if (strcmp(argv[0], "-a") == 0) { - if (argc < 1) - usage(); - argc--, argv++; - alphaFile = argv[0]; } else if (strcmp(argv[0], "-r") == 0) { if (argc < 1) usage(); @@ -106,26 +99,6 @@ main(int argc, char* argv[]) if (cp) *cp = '\0'; fclose(fd); - fd = openFile(alphaFile); - if (fgets(alpha, sizeof (alpha)-1, fd) == NULL) { - fprintf(stderr, "mkversion: No alpha information in %s.\n", alphaFile); - exit(-1); - } - fclose(fd); - cp = strchr(alpha, ' '); /* skip to 3rd blank-separated field */ - if (cp) - cp = strchr(cp+1, ' '); - if (cp) { /* append alpha to version */ - char* tp; - for (tp = strchr(version, '\0'), cp++; (*tp = *cp) != 0; tp++, cp++) - ; - if (tp[-1] == '\n') - tp[-1] = '\0'; - } else { - fprintf(stderr, "mkversion: Malformed alpha information in %s.\n", - alphaFile); - exit(-1); - } /* * Read the RELEASE-DATE, and translate format to emit TIFFLIB_VERSION.