Fix more bugs with non-palette image due to special value of -1 for cmapsize changing to 0 in 10.54

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1468 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 4 insertions, 4 deletions

diff --git a/converter/ppm/ppmtobmp.c b/converter/ppm/ppmtobmp.c
index 684b3f22..7939b4d5 100644
--- a/converter/ppm/ppmtobmp.c
+++ b/converter/ppm/ppmtobmp.c
@@ -190,7 +190,7 @@ BMPwritefileheader(FILE *        const fp,
     PutByte(fp, 'M');
 
     /* cbSize */
-    PutLong(fp, BMPlenfile(class, bitcount, -1, x, y));
+    PutLong(fp, BMPlenfile(class, bitcount, 0, x, y));
     
     /* xHotSpot */
     PutShort(fp, 0);
@@ -199,7 +199,7 @@ BMPwritefileheader(FILE *        const fp,
     PutShort(fp, 0);
     
     /* offBits */
-    PutLong(fp, BMPoffbits(class, bitcount, -1));
+    PutLong(fp, BMPoffbits(class, bitcount, 0));
     
     return 14;
 }
@@ -510,7 +510,7 @@ bmpEncode(FILE *           const ifP,
 
     nbyte += BMPwritebits(ifP, x, y, colortype, bpp, pixels, maxval,
                           colorMapP->cht);
-    if (nbyte != BMPlenfile(class, bpp, -1, x, y))
+    if (nbyte != BMPlenfile(class, bpp, 0, x, y))
         pm_error(er_internal, "BmpEncode 2");
 }
 
@@ -581,7 +581,7 @@ bmpEncodePbm(FILE *           const ifP,
             nbyte += bytesWritten;
     }
 
-    if (nbyte != BMPlenfile(class, 1, -1, cols, rows))
+    if (nbyte != BMPlenfile(class, 1, 0, cols, rows))
         pm_error(er_internal, "bmpEncodePbm 2");
 }