From 9878e719f8ffbe57b8ca3ee130b3bd8110447caa Mon Sep 17 00:00:00 2001 From: giraffedata Date: Wed, 20 Feb 2013 02:55:25 +0000 Subject: Release 10.35.88 git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@1853 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- Makefile.version | 2 +- converter/pbm/cmuwmtopbm.c | 2 +- converter/ppm/leaftoppm.c | 2 +- doc/HISTORY | 15 ++++++++++++++- generator/ppmpat.c | 2 ++ urt/rle_open_f.c | 4 ++-- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.version b/Makefile.version index 86c5b402..0f2c4fbf 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 87 +NETPBM_POINT_RELEASE = 88 diff --git a/converter/pbm/cmuwmtopbm.c b/converter/pbm/cmuwmtopbm.c index dce1d449..53c64aaa 100644 --- a/converter/pbm/cmuwmtopbm.c +++ b/converter/pbm/cmuwmtopbm.c @@ -78,7 +78,7 @@ getinit( file, colsP, rowsP, depthP, padrightP ) if ( pm_readbiglong( file, &l ) == -1 ) pm_error( "EOF / read error" ); - if ( l != CMUWM_MAGIC ) + if ( (uint32_t)l != CMUWM_MAGIC ) pm_error( "bad magic number in CMU window manager file" ); if ( pm_readbiglong( file, &l ) == -1 ) pm_error( "EOF / read error" ); 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 1dcd1844..953280d6 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,10 +4,23 @@ Netpbm. CHANGE HISTORY -------------- +13.02.20 BJH Release 10.35.88 + + ppmpat: fix wrong output with -poles. + + Windows build: fix compile error on urt/rle_open_f.c due to + Unix process management stuff. + + leaftoppm: fix incorrect determination of whether input is + Interleaf on 64 bit systems. Always broken. + + cmuwmtopbm: fix incorrect determination of whether input is + a CMU window manager bitmap on 64 bit systems. Always broken. + 12.12.05 BJH Release 10.35.87 pamtotiff: fix bug: XRESOLUTION, YRESOLUTION, and RESOLUTIONUNIT - not allowed in -tags. Broken at least since 10.35. + not allowed in -tags. Broken at least since 10.35.00. pnmmontage: fix random stuff placed in unoccupied space in the output image. Always broken (program was new in 9.10 (January diff --git a/generator/ppmpat.c b/generator/ppmpat.c index 9e2f6d05..dc8e3bbf 100644 --- a/generator/ppmpat.c +++ b/generator/ppmpat.c @@ -618,6 +618,8 @@ poles( pixels, cols, rows, maxval ) ( row - ys[i] ) * ( row - ys[i] ); if ( newdist < dist1 ) { + dist2 = dist1; + color2 = color1; dist1 = newdist; color1 = colors[i]; } diff --git a/urt/rle_open_f.c b/urt/rle_open_f.c index d2575c11..f2eae4da 100644 --- a/urt/rle_open_f.c +++ b/urt/rle_open_f.c @@ -15,14 +15,14 @@ #include #include +#include "rle.h" + #ifndef NO_OPEN_PIPES /* Need to have a SIGCLD signal catcher. */ #include #include #include -#include "rle.h" - /* Count outstanding children. Assume no more than 100 possible. */ #define MAX_CHILDREN 100 static int catching_children = 0; -- cgit 1.4.1