diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-06-28 20:00:15 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-06-28 20:00:15 +0000 |
| commit | 7a99987941825fe3dbb74b4ffff19f36fec44403 (patch) | |
| tree | e7cf520b046bdda31af3d9a94e50a6423d5ee6a0 | |
| parent | a910ed0baa181b9b2ef3ad0405c6788e9ebca0c5 (diff) | |
| download | netpbm-mirror-7a99987941825fe3dbb74b4ffff19f36fec44403.tar.gz netpbm-mirror-7a99987941825fe3dbb74b4ffff19f36fec44403.tar.xz netpbm-mirror-7a99987941825fe3dbb74b4ffff19f36fec44403.zip | |
Fix failure with -hamforce and -nocompression
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2592 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/ppm/ppmtoilbm.c | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
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 0a7b0e5b..eb3387d9 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -6,6 +6,9 @@ CHANGE HISTORY not yet BJH Release 10.72.00 + ppmtoilbm: Fix failure with -hamforce and -nocompression. + Broken in Netpbm 9.12 (March 2001). + 15.06.28 BJH Release 10.71.00 Add pamtopng. Thanks Willem vanSchaik (willem@schaik.com). |