diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-12-11 23:09:34 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2007-12-11 23:09:34 +0000 |
| commit | 2c5122b9fe73102e713a74e6ad6a86d579cb4400 (patch) | |
| tree | 1277cc97e041f7b897fd3efd075752ef1df86b53 | |
| parent | a98484391d99d3ba18c9efec66c2587ddd9393a0 (diff) | |
| download | netpbm-mirror-2c5122b9fe73102e713a74e6ad6a86d579cb4400.tar.gz netpbm-mirror-2c5122b9fe73102e713a74e6ad6a86d579cb4400.tar.xz netpbm-mirror-2c5122b9fe73102e713a74e6ad6a86d579cb4400.zip | |
Release 10.35.35
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@487 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | Makefile.version | 2 | ||||
| -rw-r--r-- | converter/other/pamtotiff.c | 4 | ||||
| -rw-r--r-- | doc/HISTORY | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.version b/Makefile.version index 661f42f4..87004e71 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 34 +NETPBM_POINT_RELEASE = 35 diff --git a/converter/other/pamtotiff.c b/converter/other/pamtotiff.c index 4174a431..49123d4f 100644 --- a/converter/other/pamtotiff.c +++ b/converter/other/pamtotiff.c @@ -351,10 +351,10 @@ putSample(sample const s, if (maxval != tiff_maxval) s2 = s * tiff_maxval / maxval; if (bitspersample > 8) { - *((unsigned short *)(*tPP)) = s; + *((unsigned short *)(*tPP)) = s2; (*tPP) += sizeof(short); } else - *(*tPP)++ = s & 0xff; + *(*tPP)++ = s2 & 0xff; } diff --git a/doc/HISTORY b/doc/HISTORY index 4256cbfa..3c23ab19 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +07.12.11 BJH Release 10.35.35 + + pamtotiff: fix incorrect pixels with PNM maxval != TIFF + maxval. + 07.11.26 BJH Release 10.35.34 xwdtopnm: deal with too-large bits per pixel value in XWD |