diff options
| -rw-r--r-- | Makefile.version | 2 | ||||
| -rw-r--r-- | converter/other/pgmtoppm.c | 5 | ||||
| -rw-r--r-- | doc/HISTORY | 8 | ||||
| -rw-r--r-- | editor/ppmchange.c | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/Makefile.version b/Makefile.version index f94dfe43..f5d9fcf1 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 19 +NETPBM_POINT_RELEASE = 20 diff --git a/converter/other/pgmtoppm.c b/converter/other/pgmtoppm.c index c695ddd5..7693fe0a 100644 --- a/converter/other/pgmtoppm.c +++ b/converter/other/pgmtoppm.c @@ -141,7 +141,10 @@ main( argc, argv ) } } - ppm_writeppmrow( stdout, pixelrow, cols, (pixval) maxval, 0 ); + if (!mappixels) + ppm_writeppmrow( stdout, pixelrow, cols, (pixval) maxval, 0 ); + else + ppm_writeppmrow( stdout, pixelrow, cols, mapmaxval, 0 ); } pm_close( ifp ); diff --git a/doc/HISTORY b/doc/HISTORY index e8504162..00580f13 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +06.12.18 BJH Release 10.35.20 + + ppmchange: Fix bug with -closeness and not -remainder or + vice versa. + + pgmtoppm: Fix garbage output with -map and input maxval + != map maxval. + 06.12.03 BJH Release 10.35.19 pbmtext: Fix crash when there is only one character. diff --git a/editor/ppmchange.c b/editor/ppmchange.c index 92d55527..6d3839bd 100644 --- a/editor/ppmchange.c +++ b/editor/ppmchange.c @@ -72,7 +72,7 @@ parseCommandLine(int argc, char ** argv, optParseOptions3(&argc, argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ - if (!closenessSpec) + if (!remainderSpec) cmdlineP->remainder_colorname = NULL; if (!closenessSpec) |