diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-12-17 00:03:49 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-12-17 00:03:49 +0000 |
| commit | ebf403d4015d30f19a37895efdce201300c9b418 (patch) | |
| tree | 6ca59a518a11af7dc192897b24fbd33318bfba1b | |
| parent | 9fb31ef92bca5af5a4eb367932d61a9f5e534d0f (diff) | |
| download | netpbm-mirror-ebf403d4015d30f19a37895efdce201300c9b418.tar.gz netpbm-mirror-ebf403d4015d30f19a37895efdce201300c9b418.tar.xz netpbm-mirror-ebf403d4015d30f19a37895efdce201300c9b418.zip | |
Release 10.84.05
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3458 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 ad92db26..787b9020 100644 --- a/converter/other/bmptopnm.c +++ b/converter/other/bmptopnm.c @@ -250,6 +250,11 @@ GetCieXyzTriple(FILE * const ifP) { +static struct pixelformat +defaultPixelformat(unsigned int const bitCount); + + + static void readOffBytes(FILE * const fp, unsigned int const nbytes) { /*---------------------------------------------------------------------------- @@ -337,6 +342,8 @@ readOs2InfoHeaderRest(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; } diff --git a/doc/HISTORY b/doc/HISTORY index 8c4cb289..1023e61b 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +18.12.17 BJH Release 10.84.05 + + bmptopnm: Fix wrong output for non-colormapped OS2 BMP. Broken + in Netpbm 10.18 (September 2003). + 18.11.05 BJH Release 10.84.04 bmptopnm: Fix array bounds violation when index value in raster diff --git a/version.mk b/version.mk index 2ff72767..8822223d 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 84 -NETPBM_POINT_RELEASE = 4 +NETPBM_POINT_RELEASE = 5 |