diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-10-13 00:50:12 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-10-13 00:50:12 +0000 |
| commit | e1c980c7e19738902347ecf87b71703d9fb2571b (patch) | |
| tree | 538dab0c360acd5bbcd46a71f34d9fd020507929 | |
| parent | c5b69ed7dadf8de4b1d19cc7617172a0390c1586 (diff) | |
| download | netpbm-mirror-e1c980c7e19738902347ecf87b71703d9fb2571b.tar.gz netpbm-mirror-e1c980c7e19738902347ecf87b71703d9fb2571b.tar.xz netpbm-mirror-e1c980c7e19738902347ecf87b71703d9fb2571b.zip | |
Release 10.35.32
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@437 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | Makefile.version | 2 | ||||
| -rw-r--r-- | converter/other/bmptopnm.c | 14 | ||||
| -rw-r--r-- | doc/HISTORY | 6 |
3 files changed, 15 insertions, 7 deletions
diff --git a/Makefile.version b/Makefile.version index cdc1570b..d8dd9a14 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 31 +NETPBM_POINT_RELEASE = 32 diff --git a/converter/other/bmptopnm.c b/converter/other/bmptopnm.c index 3ba1d77c..4d29e4d3 100644 --- a/converter/other/bmptopnm.c +++ b/converter/other/bmptopnm.c @@ -651,11 +651,15 @@ extractBitFields(unsigned int const rasterval, unsigned int const abits = (rasterval >> pixelformat.trn.shift) & pixelformat.trn.mask; - *rP = (unsigned int) rbits * maxval / pixelformat.red.mask; - *gP = (unsigned int) gbits * maxval / pixelformat.blu.mask; - *bP = (unsigned int) bbits * maxval / pixelformat.grn.mask; - *aP = (unsigned int) abits * maxval / pixelformat.trn.mask; -} + *rP = pixelformat.red.mask ? + (unsigned int) rbits * maxval / pixelformat.red.mask : 0; + *gP = pixelformat.grn.mask ? + (unsigned int) gbits * maxval / pixelformat.grn.mask : 0; + *bP = pixelformat.blu.mask ? + (unsigned int) bbits * maxval / pixelformat.blu.mask : 0; + *aP = pixelformat.trn.mask ? + (unsigned int) abits * maxval / pixelformat.trn.mask : 0; +} diff --git a/doc/HISTORY b/doc/HISTORY index 28e31175..6960d6c4 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,7 +4,11 @@ Netpbm. CHANGE HISTORY -------------- -08.09.03 BJH Release 10.35.31 +07.10.12 BJH Release 10.35.32 + + bmptopnm: fix crash with 16 bit images. + +07.09.03 BJH Release 10.35.31 pamstack: accept Standard Input properly. |