diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-07-02 14:24:48 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-07-02 14:24:48 +0000 |
| commit | 3570ac0465e240fa43670f7d3f7be585d6366f9a (patch) | |
| tree | dce0571aaf5744f131b98ec85217ea7c5adf03ab | |
| parent | 620ecbee2ed1cb478e0289722d86dd72717f1cb8 (diff) | |
| download | netpbm-mirror-3570ac0465e240fa43670f7d3f7be585d6366f9a.tar.gz netpbm-mirror-3570ac0465e240fa43670f7d3f7be585d6366f9a.tar.xz netpbm-mirror-3570ac0465e240fa43670f7d3f7be585d6366f9a.zip | |
Release 10.71.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2598 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rwxr-xr-x | buildtools/makeman | 1 | ||||
| -rw-r--r-- | converter/ppm/ppmtoilbm.c | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 12 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/buildtools/makeman b/buildtools/makeman index 9b2653bf..94ee2172 100755 --- a/buildtools/makeman +++ b/buildtools/makeman @@ -208,7 +208,6 @@ def makeman(name, file, indoc): # Special characters indoc = indoc.replace(""", "'") indoc = indoc.replace(" ", "\\ ") - indoc = indoc.replace("\", "\\\\") # Tables indoc = re.sub(' *<table[^>]*>.*', ".TS", indoc) indoc = re.sub(" *</table>.*", ".TE", indoc) diff --git a/converter/ppm/ppmtoilbm.c b/converter/ppm/ppmtoilbm.c index e1144579..9f1aca46 100644 --- a/converter/ppm/ppmtoilbm.c +++ b/converter/ppm/ppmtoilbm.c @@ -1226,7 +1226,7 @@ ppmToHam(FILE * const ifP, if( DO_COMPRESS ) writeBodyRows(); else - doHamBody(ifP, NULL, cols, rows, maxval, hammaxval, + doHamBody(ifP, stdout, cols, rows, maxval, hammaxval, nPlanes, colormap, colors); } diff --git a/doc/HISTORY b/doc/HISTORY index becf84a0..b6cdd003 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +15.07.02 BJH Release 10.71.01 + + ppmtoilbm: Fix failure with -hamforce and -nocompression. + Broken in Netpbm 9.12 (March 2001). + + makeman: fix Python syntax error. Introduced in Netpbm 10.70 + (June 2015). + 15.06.28 BJH Release 10.71.00 Add pamtopng. Thanks Willem vanSchaik (willem@schaik.com). @@ -126,7 +134,9 @@ CHANGE HISTORY works on OS X. Thanks Ryan Schmidt <ryandesign@macports.org>. makeman: deal properly with backlash in source. Thanks Willem - van Schaik <willem@schaik.com>. + van Schaik <willem@schaik.com>. But something was wrong with + this change and it caused the program always to fail, so + we reversed this change in 10.71.01. Build: don't build and install libjbig and libjasper if we are using external versions of them instead. diff --git a/version.mk b/version.mk index efb5250b..4cf0891c 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 71 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |