about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--doc/HISTORY16
-rw-r--r--lib/libpam.c3
2 files changed, 12 insertions, 7 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 1422a363..3e60dad7 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -6,23 +6,27 @@ CHANGE HISTORY
 
 not yet  BJH  Release 10.38.0
 
-              libnetpbm: fix buffer overrun with PBM images < 8 columns.
+              Add pamfixtrunc.
 
-              configure: default to 'none' for Svgalib if it doesn't appear
-              to be installed.
+              pambackground: recognize mid-row background.
 
-              add pamfixtrunc.
+              libnetpbm: fix buffer overrun with PBM images < 8 columns.
 
               ppmdraw: fix crash with use of freed storage.  Thanks
               John Walker <kelvin@fourmilab.ch>.
 
+              libnetpbm: fix crash with PAM read as PNM.
+
+              libnetpbm: Embellish "bad magic number" error message.
+
               installnetpbm: use 2-argument open() for old Perl.
     
-              libnetpbm: fix crash with PAM read as PNM.
+              configure: default to 'none' for Svgalib if it doesn't appear
+              to be installed.
 
 06.12.31 BJH  Release 10.37.0
 
-              add pambackground.  But doesn't find mid-row background yet.
+              Add pambackground.  But doesn't find mid-row background yet.
 
               pnmcrop, pamtopnm: work on multi-image stream.
               Thanks Erik Auerswald <auerswal@unix-ag.uni-kl.de>.
diff --git a/lib/libpam.c b/lib/libpam.c
index c9ab4bc9..362c1159 100644
--- a/lib/libpam.c
+++ b/lib/libpam.c
@@ -792,7 +792,8 @@ pnm_readpaminit(FILE *       const file,
         break;
         
     default:
-        pm_error("bad magic number - not a PAM, PPM, PGM, or PBM file");
+        pm_error("bad magic number 0x%x - not a PAM, PPM, PGM, or PBM file",
+                 pamP->format);
     }
     
     pamP->bytes_per_sample = pnm_bytespersample(pamP->maxval);