From 962612f80ba2da1e54247ffa2805b4d1746fc7be Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Mon, 24 Jun 2024 21:12:28 -0400 Subject: [PATCH] Update to netpbm 10.86.41 --- converter/other/infotopam.c | 16 ++++++++-------- doc/HISTORY | 6 ++++++ version.mk | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/converter/other/infotopam.c b/converter/other/infotopam.c index f2e3582..d9b5c94 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 8efa7be..ef496a3 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 e899f7f..d2fd021 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