diff options
-rw-r--r-- | converter/ppm/ximtoppm.c | 6 | ||||
-rw-r--r-- | doc/HISTORY | 8 | ||||
-rw-r--r-- | editor/pamfunc.c | 2 | ||||
-rw-r--r-- | version.mk | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/converter/ppm/ximtoppm.c b/converter/ppm/ximtoppm.c index d844031c..d839e770 100644 --- a/converter/ppm/ximtoppm.c +++ b/converter/ppm/ximtoppm.c @@ -125,9 +125,9 @@ ReadXimHeader(FILE * const in_fp, #endif header->bits_channel = atoi(a_head.bits_per_channel); header->alpha_flag = atoi(a_head.alpha_channel); - pm_asprintf(&header->author, a_head.author); - pm_asprintf(&header->date, a_head.date); - pm_asprintf(&header->program, a_head.program); + header->author = pm_strdup(a_head.author); + header->date = pm_strdup(a_head.date); + header->program = pm_strdup(a_head.program); /* Do double checking for backwards compatibility */ if (header->npics == 0) diff --git a/doc/HISTORY b/doc/HISTORY index a60cd79c..3f9dd812 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +20.09.05 BJH Release 10.91.03 + + pamfunc: Fix always wrong output with -not. Always broken. + (-not was new in Netpbm 10.40 (September 2007)). + + ximtoppm: Fix bug: invalid memory references with pathological + image input. Broken in Netpbm 10.91.00 (June 2020). + 20.08.29 BJH Release 10.91.02 pamdepth: fix bug: doesn't work on PAM with black and white diff --git a/editor/pamfunc.c b/editor/pamfunc.c index 5945b82d..6a121883 100644 --- a/editor/pamfunc.c +++ b/editor/pamfunc.c @@ -368,7 +368,7 @@ applyFunction(struct CmdlineInfo const cmdline, outSample = inSample ^ cmdline.u.mask; break; case FN_NOT: - outSample = ~inSample; + outSample = ~inSample & outpam.maxval; break; case FN_SHIFTLEFT: outSample = diff --git a/version.mk b/version.mk index 3d6a805e..d6efbaf4 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 91 -NETPBM_POINT_RELEASE = 2 +NETPBM_POINT_RELEASE = 3 |