about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-12-16 19:31:38 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-12-16 19:31:38 +0000
commitb12ffea72b2600ec640291b6876d161a65307e71 (patch)
treea1e3e0caa08e0d2e18f172931c7b1f9dbb2801e8
parenta303af2f2fc1ee474678d7076a821af9be4f9aa9 (diff)
downloadnetpbm-mirror-b12ffea72b2600ec640291b6876d161a65307e71.tar.gz
netpbm-mirror-b12ffea72b2600ec640291b6876d161a65307e71.tar.xz
netpbm-mirror-b12ffea72b2600ec640291b6876d161a65307e71.zip
Fix 64 bit signed long problem
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1813 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/ppm/leaftoppm.c2
-rw-r--r--doc/HISTORY3
2 files changed, 4 insertions, 1 deletions
diff --git a/converter/ppm/leaftoppm.c b/converter/ppm/leaftoppm.c
index bda44494..61c19c1e 100644
--- a/converter/ppm/leaftoppm.c
+++ b/converter/ppm/leaftoppm.c
@@ -36,7 +36,7 @@ leaf_init(FILE *  const fp,
     long magic;
     
     pm_readbiglong(fp, &magic);
-    if (magic != 0x894f5053)
+    if ((uint32_t)magic != 0x894f5053)
         pm_error("Bad magic number.  First 4 bytes should be "
                  "0x894f5053 but are instead 0x%08x", (unsigned)magic);
     
diff --git a/doc/HISTORY b/doc/HISTORY
index 9577c850..7d61c215 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -31,6 +31,9 @@ not yet  BJH  Release 10.61.00
               pnmpsnr: fix crash when invoked (invalidly) with only one
               argument.  Always broken.
 
+              leaftoppm: fix incorrect determination of whether input is
+              Interleaf on 64 bit systems.
+
               pnmmontage: fix totally wrong output.  Broken in 10.44
               (August 2008).