From 2f8194e0587030827feb78f648e1d6ca274911c6 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sun, 10 Aug 2008 18:38:33 +0000 Subject: Fix shifting within 8 bits git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@697 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- lib/libpbm2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/libpbm2.c') diff --git a/lib/libpbm2.c b/lib/libpbm2.c index 3dbd7173..a8e4b0f6 100644 --- a/lib/libpbm2.c +++ b/lib/libpbm2.c @@ -251,9 +251,12 @@ pbm_readpbmrow_bitoffset(FILE * const ifP, /* Adjust rightmost char */ unsigned int const trs = (cols + rsh) % 8; unsigned int const tls = 8 - trs; - unsigned char const origEndShift = (origEnd << trs) >> trs; + unsigned char const rightBits = + ((unsigned char)(origEnd << trs) >> trs); + unsigned char const leftBits = + ((unsigned char)(window[last] >> tls) << tls); - window[last] = (window[last] >> tls) << tls | origEndShift; + window[last] = leftBits | rightBits; } } -- cgit 1.4.1