diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-12-17 00:04:18 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-12-17 00:04:18 +0000 |
| commit | 76758a935da3169d8fd556532f4180b109589561 (patch) | |
| tree | e6552a94b33a413798471feafb97c4334b4b98c8 | |
| parent | 12b7402c6461f2b1d186e6e13124ff6c48fc41c6 (diff) | |
| download | netpbm-mirror-76758a935da3169d8fd556532f4180b109589561.tar.gz netpbm-mirror-76758a935da3169d8fd556532f4180b109589561.tar.xz netpbm-mirror-76758a935da3169d8fd556532f4180b109589561.zip | |
Release 10.73.24
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@3459 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/other/bmptopnm.c | 7 | ||||
| -rw-r--r-- | doc/HISTORY | 5 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/converter/other/bmptopnm.c b/converter/other/bmptopnm.c index 9e476ef4..bf4d10f8 100644 --- a/converter/other/bmptopnm.c +++ b/converter/other/bmptopnm.c @@ -227,6 +227,11 @@ GetCieXyzTriple(FILE * const fp) { +static struct pixelformat +defaultPixelformat(unsigned int const bitCount); + + + static void readOffBytes(FILE * const fp, unsigned int const nbytes) { /*---------------------------------------------------------------------------- @@ -318,6 +323,8 @@ readOs2InfoHeader(FILE * const ifP, pm_error("Unrecognized bits per pixel in OS/2 BMP file header: %d", headerP->cBitCount); + headerP->pixelformat = defaultPixelformat(headerP->cBitCount); + headerP->compression = BMPCOMP_RGB; pm_message("OS/2 BMP, %dx%dx%d", diff --git a/doc/HISTORY b/doc/HISTORY index b34e2244..f06128f9 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +18.12.17 BJH Release 10.73.24 + + bmptopnm: Fix wrong output for non-colormapped OS2 BMP. Broken + in Netpbm 10.18 (September 2003). + 18.11.05 BJH Release 10.73.23 bmptopnm: Fix array bounds violation when index value in raster diff --git a/version.mk b/version.mk index 528b929a..4c66bc59 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 73 -NETPBM_POINT_RELEASE = 23 +NETPBM_POINT_RELEASE = 24 |