diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-07-04 18:08:00 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-07-04 18:08:00 +0000 |
| commit | 385ab045af436fbf7e49893af0dc6a9d36db06b2 (patch) | |
| tree | ce801623ab1d34d1a056e0bdb941ad5951971f25 | |
| parent | a8cf85cdd61e22cbc629a45e88cc7995263191b6 (diff) | |
| download | netpbm-mirror-385ab045af436fbf7e49893af0dc6a9d36db06b2.tar.gz netpbm-mirror-385ab045af436fbf7e49893af0dc6a9d36db06b2.tar.xz netpbm-mirror-385ab045af436fbf7e49893af0dc6a9d36db06b2.zip | |
Release 10.47.39
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1708 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/ppm/ppmtobmp.c | 4 | ||||
| -rw-r--r-- | doc/HISTORY | 5 | ||||
| -rw-r--r-- | version.mk | 2 |
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 |