diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-10-03 01:42:21 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-10-03 01:42:21 +0000 |
| commit | 5294826b47df3f9437ae9333fab3fb5c1ea428aa (patch) | |
| tree | 5f47be7ac4c754c2dfc8b3963e0b798263c8f26c | |
| parent | ac2d80e79ba066908fea219803488f9306482f7e (diff) | |
| download | netpbm-mirror-5294826b47df3f9437ae9333fab3fb5c1ea428aa.tar.gz netpbm-mirror-5294826b47df3f9437ae9333fab3fb5c1ea428aa.tar.xz netpbm-mirror-5294826b47df3f9437ae9333fab3fb5c1ea428aa.zip | |
Release 10.60.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@1750 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/other/sunicontopnm.c | 3 | ||||
| -rw-r--r-- | doc/HISTORY | 8 | ||||
| -rw-r--r-- | generator/pamgauss.c | 5 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/converter/other/sunicontopnm.c b/converter/other/sunicontopnm.c index ad5aa0f8..eff1be58 100644 --- a/converter/other/sunicontopnm.c +++ b/converter/other/sunicontopnm.c @@ -130,8 +130,9 @@ main(int argc, const char ** argv) { assert(depth == 8); format = PGM_TYPE; maxval = 255; + pgm_writepgminit(stdout, cols, rows, maxval, 0); grayrow = pgm_allocrow(cols); - colChars = cols / depth; + colChars = cols; } for (row = 0; row < rows; ++row) { diff --git a/doc/HISTORY b/doc/HISTORY index c451d38e..4b6ebfb8 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +12.10.03 BJH Release 10.60.01 + + Sunicontopnm: Fix incorrect output for depth 8. Always broken + (depth = 8 capability was added in Netpbm 10.53 (December 2010). + + pamgauss: Fix bug: erroneously says -maxval is too big on 64 bit + system. Always broken (Pamgauss was added in 10.23 (July 2004). + 12.09.30 BJH Release 10.60.00 xpmtoppm: major speedup for 3-character-per pixel files, diff --git a/generator/pamgauss.c b/generator/pamgauss.c index 34b510f6..b6afdb7e 100644 --- a/generator/pamgauss.c +++ b/generator/pamgauss.c @@ -19,7 +19,7 @@ struct cmdlineInfo { */ unsigned int width; unsigned int height; - sample maxval; + unsigned int maxval; float sigma; const char * tupletype; }; @@ -83,8 +83,7 @@ parseCommandLine(int argc, char ** argv, else { if (cmdlineP->maxval > PNM_OVERALLMAXVAL) pm_error("The maxval you specified (%u) is too big. " - "Maximum is %u", (unsigned int) cmdlineP->maxval, - PNM_OVERALLMAXVAL); + "Maximum is %u", cmdlineP->maxval, PNM_OVERALLMAXVAL); if (cmdlineP->maxval < 1) pm_error("-maxval must be at least 1"); } diff --git a/version.mk b/version.mk index 399e7956..8c3be32b 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 60 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |