about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-05-01 02:51:14 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-05-01 02:51:14 +0000
commit93d6e6c17d3ec56aa2957d5ce7cf5d3633c11e87 (patch)
tree33800dfe342b3198ff18a88cf5f6c8a745b31e0d
parent57b3c8cbeca6b911ad989933f391ef36ea1b4a64 (diff)
downloadnetpbm-mirror-93d6e6c17d3ec56aa2957d5ce7cf5d3633c11e87.tar.gz
netpbm-mirror-93d6e6c17d3ec56aa2957d5ce7cf5d3633c11e87.tar.xz
netpbm-mirror-93d6e6c17d3ec56aa2957d5ce7cf5d3633c11e87.zip
Release 10.46.04
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@906 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY6
-rw-r--r--lib/util/intcode.h4
-rw-r--r--version.mk2
3 files changed, 9 insertions, 3 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index e982d2bf..691dc84e 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,12 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+
+09.05.01 BJH  Release 10.46.04
+
+              ilbmtoppm: fix some bug in interpreting ILBM input.
+              (due to wrong pm_uintFromBigend16()).  From 10.46.00.
+
 09.04.28 BJH  Release 10.46.03
 
               pnmremap: fix loss of dithering when the map (and thus the
diff --git a/lib/util/intcode.h b/lib/util/intcode.h
index 155e47e1..0ee70932 100644
--- a/lib/util/intcode.h
+++ b/lib/util/intcode.h
@@ -118,8 +118,8 @@ pm_uintFromBigend16(bigend16 const arg) {
     }; break;
     case LITTLE_ENDIAN: {
         retval =
-            (arg.bytes[0] << 16) |
-            (arg.bytes[1] <<  8);
+            (arg.bytes[0] << 8) |
+            (arg.bytes[1] << 0);
     } break;
     }
     return retval;
diff --git a/version.mk b/version.mk
index aa7209b8..c749775a 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 46
-NETPBM_POINT_RELEASE = 3
+NETPBM_POINT_RELEASE = 4