From e7699067fce588bb8ac3172f19783db2b3b87990 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Wed, 3 Oct 2012 01:41:30 +0000 Subject: Release 10.47.41 git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1749 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- doc/HISTORY | 5 +++++ generator/pamgauss.c | 5 ++--- version.mk | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/HISTORY b/doc/HISTORY index 0e027ab8..9b0301ec 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +12.10.03 BJH Release 10.47.41 + + pamgauss: Fix bug: erroneously says -maxval is too big. + Always broken (Pamgauss was added in 10.23 (July 2004). + 12.08.20 BJH Release 10.47.40 Build: rename getline() in xpmtoppm.c to avoid collision diff --git a/generator/pamgauss.c b/generator/pamgauss.c index eb5fa3fe..4dd932c4 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; }; @@ -82,8 +82,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 2bd754d8..b7e191fb 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 47 -NETPBM_POINT_RELEASE = 40 +NETPBM_POINT_RELEASE = 41 -- cgit 1.4.1