diff options
| -rw-r--r-- | doc/HISTORY | 7 | ||||
| -rw-r--r-- | lib/libppm1.c | 4 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 4ed4239d..037b074a 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,13 @@ Netpbm. CHANGE HISTORY -------------- +14.12.25 BJH Release 10.68.03 + + Fix bogus message from ppmXXX programs when the input is not + (per the magic number) a Netpbm image. Introduced after + Netpbm 10.26 (January 2005) but before Netpbm 10.35 (August + 2006). + 14.11.23 BJH Release 10.68.02 pambackground: fix bug: segfault or incorrect results in most diff --git a/lib/libppm1.c b/lib/libppm1.c index ff940540..2e17e894 100644 --- a/lib/libppm1.c +++ b/lib/libppm1.c @@ -148,8 +148,8 @@ ppm_readppminit(FILE * const fileP, break; default: - pm_error("bad magic number %d - not a PPM, PGM, PBM, or PAM file", - PAM_FORMAT_TYPE(*formatP)); + pm_error("bad magic number 0x%x - not a PPM, PGM, PBM, or PAM file", + realFormat); } validateComputableSize(*colsP, *rowsP); } diff --git a/version.mk b/version.mk index f2d33160..d4fb3e35 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 68 -NETPBM_POINT_RELEASE = 2 +NETPBM_POINT_RELEASE = 3 |