From b12ffea72b2600ec640291b6876d161a65307e71 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sun, 16 Dec 2012 19:31:38 +0000 Subject: Fix 64 bit signed long problem git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1813 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/ppm/leaftoppm.c | 2 +- doc/HISTORY | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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). -- cgit 1.4.1