diff options
-rw-r--r-- | converter/other/infotopam.c | 16 | ||||
-rw-r--r-- | doc/HISTORY | 6 | ||||
-rw-r--r-- | version.mk | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/converter/other/infotopam.c b/converter/other/infotopam.c index 24c4d776..3467891c 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 d9a71114..3a79d9b8 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,12 @@ Netpbm. CHANGE HISTORY -------------- +24.03.11 BJH Release 11.05.03 + + infotopam: fix incorrect output -- columns always in wrong + place. Always broken. (infotopam was new in Netpbm 10.22 (May + 2004)). + 24.01.28 BJH Release 11.05.02 ppmtowinicon: fix array overrun with 4 and 8 bits per pixel. diff --git a/version.mk b/version.mk index bcedddf1..6b1c99ac 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 11 NETPBM_MINOR_RELEASE = 5 -NETPBM_POINT_RELEASE = 2 +NETPBM_POINT_RELEASE = 3 |