about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2024-03-30 18:32:43 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2024-03-30 18:32:43 +0000
commit76ff9ce15f666ff5e57092f0d43d3dfea725f855 (patch)
treec704afa6242013c49193b738837ed087f37cd114
parentd042c20fd7b04d8369c803936e1a95371f3055a7 (diff)
downloadnetpbm-mirror-super_stable.tar.gz
netpbm-mirror-super_stable.tar.xz
netpbm-mirror-super_stable.zip
Release 10.86.41 super_stable
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@4898 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/infotopam.c16
-rw-r--r--doc/HISTORY6
-rw-r--r--version.mk2
3 files changed, 15 insertions, 9 deletions
diff --git a/converter/other/infotopam.c b/converter/other/infotopam.c
index f2e35827..d9b5c945 100644
--- a/converter/other/infotopam.c
+++ b/converter/other/infotopam.c
@@ -301,14 +301,14 @@ addBitplane(unsigned char * const icon,
     unsigned int j;
     
     for (i = j = 0; i < bpsize; ++i, j += 8) {
-        icon[j+0] = (icon[j+0] << 1) | ((buff[i] >> 0) & 0x01);
-        icon[j+1] = (icon[j+1] << 1) | ((buff[i] >> 1) & 0x01);
-        icon[j+2] = (icon[j+2] << 1) | ((buff[i] >> 2) & 0x01);
-        icon[j+3] = (icon[j+3] << 1) | ((buff[i] >> 3) & 0x01);
-        icon[j+4] = (icon[j+4] << 1) | ((buff[i] >> 4) & 0x01);
-        icon[j+5] = (icon[j+5] << 1) | ((buff[i] >> 5) & 0x01);
-        icon[j+6] = (icon[j+6] << 1) | ((buff[i] >> 6) & 0x01);
-        icon[j+7] = (icon[j+7] << 1) | ((buff[i] >> 7) & 0x01);
+        icon[j+0] = (icon[j+0] << 1) | ((buff[i] >> 7) & 0x01);
+        icon[j+1] = (icon[j+1] << 1) | ((buff[i] >> 6) & 0x01);
+        icon[j+2] = (icon[j+2] << 1) | ((buff[i] >> 5) & 0x01);
+        icon[j+3] = (icon[j+3] << 1) | ((buff[i] >> 4) & 0x01);
+        icon[j+4] = (icon[j+4] << 1) | ((buff[i] >> 3) & 0x01);
+        icon[j+5] = (icon[j+5] << 1) | ((buff[i] >> 2) & 0x01);
+        icon[j+6] = (icon[j+6] << 1) | ((buff[i] >> 1) & 0x01);
+        icon[j+7] = (icon[j+7] << 1) | ((buff[i] >> 0) & 0x01);
     }
 }
 
diff --git a/doc/HISTORY b/doc/HISTORY
index 8efa7be7..ef496a32 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,12 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+not yet  BJH  Release 10.86.41
+
+              infotopam: fix incorrect output -- columns always in wrong
+              place.  Always broken.  (infotopam was new in Netpbm 10.22 (May
+              2004)).
+
 23.12.28 BJH  Release 10.86.40
 
               pnmconvol: Restore ability of convolution matrix to be a
diff --git a/version.mk b/version.mk
index e899f7f3..d2fd021b 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 86
-NETPBM_POINT_RELEASE = 40
+NETPBM_POINT_RELEASE = 41