diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-09-25 19:59:45 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-09-25 19:59:45 +0000 |
commit | 63ea1308a6f5dd25e1060bdd3e07b2f63c20261a (patch) | |
tree | e2f36e7a9b881d015649ded812c6ea50449934f5 /converter/other/pgmtoppm.c | |
parent | 6b0b9772094583ab5267a024f2a63234cd1d9cb2 (diff) | |
download | netpbm-mirror-63ea1308a6f5dd25e1060bdd3e07b2f63c20261a.tar.gz netpbm-mirror-63ea1308a6f5dd25e1060bdd3e07b2f63c20261a.tar.xz netpbm-mirror-63ea1308a6f5dd25e1060bdd3e07b2f63c20261a.zip |
whitespace
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4130 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/pgmtoppm.c')
-rw-r--r-- | converter/other/pgmtoppm.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/converter/other/pgmtoppm.c b/converter/other/pgmtoppm.c index c3a26594..2c0d5524 100644 --- a/converter/other/pgmtoppm.c +++ b/converter/other/pgmtoppm.c @@ -37,7 +37,7 @@ parseCommandLine(int argc, char ** argv, struct cmdlineInfo * const cmdlineP) { /*---------------------------------------------------------------------------- parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP. If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -101,7 +101,7 @@ parseCommandLine(int argc, char ** argv, cmdlineP->inputFilename = "-"; else cmdlineP->inputFilename = argv[2]; - + if (argc-1 > 2) pm_error("Program takes at most 2 arguments: " "color name/range and input file name. " @@ -128,7 +128,7 @@ convertWithMap(FILE * const ifP, pixval mapmaxval; pixel ** mappixels; unsigned int mapmaxcolor; - + mapFileP = pm_openr(mapFileName); mappixels = ppm_readppm(mapFileP, &mapcols, &maprows, &mapmaxval); pm_close(mapFileP); @@ -138,7 +138,7 @@ convertWithMap(FILE * const ifP, for (row = 0; row < rows; ++row) { unsigned int col; - + pgm_readpgmrow(ifP, grayrow, cols, maxval, format); for (col = 0; col < cols; ++col) { @@ -176,7 +176,7 @@ convertLinear(FILE * const ifP, colorBlack = ppm_parsecolor(colorNameBlack, maxval); colorWhite = ppm_parsecolor(colorNameWhite, maxval); - + red0 = PPM_GETR(colorBlack); grn0 = PPM_GETG(colorBlack); blu0 = PPM_GETB(colorBlack); @@ -228,7 +228,7 @@ main(int argc, convertWithMap(ifP, cols, rows, maxval, format, cmdline.map, stdout, grayrow, pixelrow); else - convertLinear(ifP, cols, rows, maxval, format, + convertLinear(ifP, cols, rows, maxval, format, cmdline.colorBlack, cmdline.colorWhite, stdout, grayrow, pixelrow); @@ -241,3 +241,6 @@ main(int argc, */ return 0; } + + + |