diff options
Diffstat (limited to 'converter/other/bmptopnm.c')
-rw-r--r-- | converter/other/bmptopnm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/converter/other/bmptopnm.c b/converter/other/bmptopnm.c index 3f66634b..091d948a 100644 --- a/converter/other/bmptopnm.c +++ b/converter/other/bmptopnm.c @@ -140,9 +140,7 @@ parseCommandLine(int argc, const char ** argv, Note that the file spec array we return is stored in the storage that was passed to us as the argv array. -----------------------------------------------------------------------------*/ - optEntry * option_def; - /* Instructions to OptParseOptions2 on how to parse our options. - */ + optEntry * option_def; /* Used by OPTENT3 */ optStruct3 opt; unsigned int option_def_index; @@ -156,7 +154,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. */ if (argc-1 == 0) @@ -196,6 +194,8 @@ GetShort(FILE * const fp) { return v; } + + static short GetBigShort(FILE * const fp) { @@ -938,6 +938,7 @@ convertRow32(unsigned char const bmprow[], } + static void validateIndex(unsigned int const index, unsigned int const cmapSize ) { @@ -1718,3 +1719,4 @@ main(int argc, const char ** argv) { } + |