diff options
Diffstat (limited to 'analyzer/pamfile.c')
| -rw-r--r-- | analyzer/pamfile.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/analyzer/pamfile.c b/analyzer/pamfile.c index 7b61f6fd..80674710 100644 --- a/analyzer/pamfile.c +++ b/analyzer/pamfile.c @@ -1,4 +1,4 @@ -/* pamfile.c - describe a portable anymap +/* pamfile.c - describe a Netpbm image ** ** Copyright (C) 1991 by Jef Poskanzer. ** @@ -40,7 +40,7 @@ parseCommandLine(int argc, const char ** argv, was passed to as as the argv array. -----------------------------------------------------------------------------*/ optEntry * option_def; - /* Instructions to pm_optParseOptions3 on how to parse our options. + /* Instructions to pm_optParseOptions4 on how to parse our options. */ optStruct3 opt; @@ -60,7 +60,7 @@ parseCommandLine(int argc, const char ** argv, opt.short_allowed = false; /* We have no short (old-fashioned) options */ opt.allowNegNum = false; /* We have no parms that are negative numbers */ - pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); + pm_optParseOptions4(&argc, argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others */ cmdlineP->inputFilespec = (const char **)&argv[1]; @@ -92,30 +92,30 @@ dumpHeaderHuman(struct pam const pam) { printf(" Tuple type: %s\n", pam.tuple_type); break; - case PBM_FORMAT: + case PBM_FORMAT: printf("PBM plain, %d by %d\n", pam.width, pam.height ); break; - case RPBM_FORMAT: + case RPBM_FORMAT: printf("PBM raw, %d by %d\n", pam.width, pam.height); break; - case PGM_FORMAT: + case PGM_FORMAT: printf("PGM plain, %d by %d maxval %ld\n", pam.width, pam.height, pam.maxval); break; - case RPGM_FORMAT: + case RPGM_FORMAT: printf("PGM raw, %d by %d maxval %ld\n", pam.width, pam.height, pam.maxval); break; - case PPM_FORMAT: + case PPM_FORMAT: printf("PPM plain, %d by %d maxval %ld\n", pam.width, pam.height, pam.maxval); break; - case RPPM_FORMAT: + case RPPM_FORMAT: printf("PPM raw, %d by %d maxval %ld\n", pam.width, pam.height, pam.maxval); break; @@ -136,32 +136,32 @@ dumpHeaderMachine(struct pam const pam) { plain = false; break; - case PBM_FORMAT: + case PBM_FORMAT: formatString = "PBM"; plain = TRUE; break; - case RPBM_FORMAT: + case RPBM_FORMAT: formatString = "PBM"; plain = false; break; - case PGM_FORMAT: + case PGM_FORMAT: formatString = "PGM"; plain = TRUE; break; - case RPGM_FORMAT: + case RPGM_FORMAT: formatString = "PGM"; plain = false; break; - case PPM_FORMAT: + case PPM_FORMAT: formatString = "PPM"; plain = TRUE; break; - case RPPM_FORMAT: + case RPPM_FORMAT: formatString = "PPM"; plain = false; break; } @@ -227,6 +227,7 @@ readToNextImage(const struct pam * const pamP, } + static void doOneImage(const char * const name, unsigned int const imageDoneCt, @@ -340,11 +341,10 @@ main(int argc, const char *argv[]) { cmdline.comments); pm_close(ifP); - } - } + } + } return 0; } - |