about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--converter/ppm/ppmtobmp.c4
-rw-r--r--doc/HISTORY5
-rw-r--r--version.mk2
3 files changed, 8 insertions, 3 deletions
diff --git a/converter/ppm/ppmtobmp.c b/converter/ppm/ppmtobmp.c
index 9075ad6d..c295f70c 100644
--- a/converter/ppm/ppmtobmp.c
+++ b/converter/ppm/ppmtobmp.c
@@ -505,7 +505,7 @@ bmpEncode(FILE *           const ifP,
 
     if (nbyte != (BMPlenfileheader(class)
                   + BMPleninfoheader(class)
-                  + BMPlencolormap(class, bpp, -1)))
+                  + BMPlencolormap(class, bpp, 0)))
         pm_error(er_internal, "BmpEncode 1");
 
     nbyte += BMPwritebits(ifP, x, y, colortype, bpp, pixels, maxval,
@@ -564,7 +564,7 @@ bmpEncodePbm(FILE *           const ifP,
 
     if (nbyte != (BMPlenfileheader(class)
                   + BMPleninfoheader(class)
-                  + BMPlencolormap(class, 1, -1)))
+                  + BMPlencolormap(class, 1, 0)))
         pm_error(er_internal, "bmpEncodePBM 1");
    
     for (row = 0; row < rows; ++row){
diff --git a/doc/HISTORY b/doc/HISTORY
index aff9fc37..61004628 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+12.07.04 BJH  Release 10.47.39
+
+              ppmtobmp: fix failure with "internal error" message on all
+              uses.  Broken in 10.47.23.
+
 12.06.21 BJH  Release 10.47.38
 
               configure: work around Perl bug that causes 'configure' to
diff --git a/version.mk b/version.mk
index aa24bb86..2b3e918a 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 38
+NETPBM_POINT_RELEASE = 39