diff options
-rw-r--r-- | converter/other/pngx.h | 4 | ||||
-rw-r--r-- | converter/pbm/cmuwmtopbm.c | 7 | ||||
-rw-r--r-- | doc/HISTORY | 17 | ||||
-rw-r--r-- | doc/TESTS | 10 | ||||
-rwxr-xr-x | test/pbmtext.test | 10 | ||||
-rwxr-xr-x | test/pnmquantall.test | 2 | ||||
-rw-r--r-- | version.mk | 4 |
7 files changed, 22 insertions, 32 deletions
diff --git a/converter/other/pngx.h b/converter/other/pngx.h index 008081eb..cabb0663 100644 --- a/converter/other/pngx.h +++ b/converter/other/pngx.h @@ -2,10 +2,6 @@ #define PNGX_H_INCLUDED #include <png.h> - /* This includes the Zlib interface header file zlib.h because libpng uses - libz and some of the Zlib interface, e.g. the Z_DEFLATED constant, - is part of the libpng interface. - */ #include "pm_c_util.h" /* pngx is designed to be an extension of the PNG library to make using diff --git a/converter/pbm/cmuwmtopbm.c b/converter/pbm/cmuwmtopbm.c index be8a7fc1..ccf8cfc9 100644 --- a/converter/pbm/cmuwmtopbm.c +++ b/converter/pbm/cmuwmtopbm.c @@ -68,8 +68,8 @@ readCmuwmHeader(FILE * const ifP, int -main(int argc, - const char ** argv) { +main(int argc, + char * argv[]) { FILE * ifP; unsigned char * bitrow; @@ -78,7 +78,7 @@ main(int argc, const char * inputFileName; - pm_proginit(&argc, argv); + pbm_init(&argc, argv); if (argc-1 > 1) pm_error("Too many arguments (%u). " @@ -117,7 +117,6 @@ main(int argc, pbm_writepbmrow_packed(stdout, bitrow, cols, 0); } - pbm_freerow_packed(bitrow); pm_close(ifP); pm_close(stdout); diff --git a/doc/HISTORY b/doc/HISTORY index a8bf7fbc..65b64783 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,23 +4,24 @@ Netpbm. CHANGE HISTORY -------------- -16.09.27 BJH Release 10.76.00 +16.09.02 BJH Release 10.75.03 + + pnmquantall: Fix incorrect handling of when the Pnmremap or + the final rename fails. + +16.09.01 BJH Release 10.75.02 pnmquantall: Fix failure when temporary file location is not the same filesystem as the output file. - pnmquantall: Fix incorrect handling of when the Pnmremap or - the final rename fails. + Build: tifftopnm.c: fix undefined WIFSIGNALED, etc. in + +16.08.13 BJH Release 10.75.01 giftopnm: Fix bug: crash on little-endian computers that can't toleration unaligned memory access. Thanks Ignatios Souvatzis (is@netbsd.org). Broken in Netpbm 10.47 (June 2009). - cmuwmtopbm: fix trivial memory leak. Always broken (cmuwmtopbm - was in primordial Pbmplus, in 1988). - - Build: tifftopnm.c: fix undefined WIFSIGNALED, etc. in - 16.06.26 BJH Release 10.75.00 pbmtextps: Add -leftmargin, -rightmargin, -topmargin, diff --git a/doc/TESTS b/doc/TESTS index e87f5570..69520fbc 100644 --- a/doc/TESTS +++ b/doc/TESTS @@ -68,16 +68,14 @@ appear at the end: ================= The tests require the Bash command shell. The script Execute-Tests has -some expressions unique to Bash. Quite old versions work, at least back -to Bash v. 2.05b. +some expressions unique to bash. Quite old versions work, at least back +to bash v. 2.05b. -Awk is also required, but the constructs are all simple. Gawk, Mawk and -BWK Awk (the "One True Awk") are all known to work. - -The tests use the following utilities: +The tests also use the following utilities: - sh - awk + - perl - cat - cksum diff --git a/test/pbmtext.test b/test/pbmtext.test index 064b1660..20c9b285 100755 --- a/test/pbmtext.test +++ b/test/pbmtext.test @@ -6,13 +6,9 @@ tmpdir=${tmpdir:-/tmp} # Test 1: -# Should print 3898818212 967 twice - pbmtext UNIX Philosophy: Do one thing and do it well. | cksum echo -n "UNIX Philosophy: Do one thing and do it well." | pbmtext | cksum -# Should print 2506052117 1354 twice - pbmtext -builtin fixed \ For truth is always strange. Stranger than fiction. Lord Byron | cksum echo -n "For truth is always strange. Stranger than fiction. Lord Byron" | \ @@ -80,13 +76,13 @@ rm ${fontRectangle_txt} ${font_pbm} # Test 5: Print all characters defined in the built-in bdf font # One long row -# Should print 3233136020 4535 +# Should print awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i); for (i=160;i<=255;++i) printf("%c",i); }' | \ pbmtext -builtin bdf | cksum # One tall column -# Should print 1216262214 5711 +# Should print awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i); for (i=160;i<=255;++i) printf("%c\n",i); }' | \ pbmtext -nomargins -builtin bdf | cksum @@ -98,7 +94,7 @@ awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i); font_bdf=${tmpdir}/font.bdf font_corrupt_bdf=${tmpdir}/fontcorrupt.bdf -# Though this BDF font file defines only three letters, it is valid. +# Though this is BDF font file defines only three letters, it is valid. cat > ${font_bdf} << EOF STARTFONT 2.1 diff --git a/test/pnmquantall.test b/test/pnmquantall.test index 7d9ddf82..f0f18ab0 100755 --- a/test/pnmquantall.test +++ b/test/pnmquantall.test @@ -14,4 +14,4 @@ done # Should print 1 pnmcat testimg.red testimg.grn testimg.blu -tb | \ - pgmhist -m | awk '$2>0 {s++}; END { print (s<=20) }' + pgmhist -m | awk '$2>0 {s++}; END { print s<=20 }' diff --git a/version.mk b/version.mk index bec303b0..2e1fd526 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 -NETPBM_MINOR_RELEASE = 76 -NETPBM_POINT_RELEASE = 0 +NETPBM_MINOR_RELEASE = 75 +NETPBM_POINT_RELEASE = 3 |