about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2015-12-09 02:52:46 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2015-12-09 02:52:46 +0000
commit69bd3c36d6eaaaa74f14e841103d5c2f2ed6f6d1 (patch)
treef81bde78bf3eb2f6f8199b114e7eb017aec86ac0
parent52cb53d8dc6e2e1c6475f9152d98e8468f1b467f (diff)
downloadnetpbm-mirror-69bd3c36d6eaaaa74f14e841103d5c2f2ed6f6d1.tar.gz
netpbm-mirror-69bd3c36d6eaaaa74f14e841103d5c2f2ed6f6d1.tar.xz
netpbm-mirror-69bd3c36d6eaaaa74f14e841103d5c2f2ed6f6d1.zip
Release 10.72.04
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2663 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rw-r--r--editor/pnmpaste.c2
-rw-r--r--version.mk2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index e3579f9c..4b3a0919 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+15.12.09 BJH  Release 10.72.04
+
+              pnmpaste: fix bug with PBM: incorrect output.  Introduced in
+              Netpbm 10.44 (September 2008).
+
 15.11.25 BJH  Release 10.72.03
 
               pnmtops: fix bug: always things -level=N is -level=1.
diff --git a/editor/pnmpaste.c b/editor/pnmpaste.c
index 0cd9b23b..a47e1d66 100644
--- a/editor/pnmpaste.c
+++ b/editor/pnmpaste.c
@@ -125,7 +125,7 @@ rightBits(unsigned char const x,
 -----------------------------------------------------------------------------*/
     assert(n <= 8);
 
-    return (x << (8-n)) >> (8-n);
+    return ((unsigned char)(x << (8-n))) >> (8-n);
 }
 
 
diff --git a/version.mk b/version.mk
index 348612e3..3fd6ae3b 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 72
-NETPBM_POINT_RELEASE = 3
+NETPBM_POINT_RELEASE = 4