diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-12-31 09:36:54 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-12-31 09:36:54 +0000 |
commit | 67291597b49a9b5b8f26ad7cb58932b07573df3a (patch) | |
tree | 6d5f0c56902aff0ef37c13b8ea92baf2ba40d578 | |
parent | 3e80c6fc16a176eb46a7a98b3299831b13d466a3 (diff) | |
download | netpbm-mirror-67291597b49a9b5b8f26ad7cb58932b07573df3a.tar.gz netpbm-mirror-67291597b49a9b5b8f26ad7cb58932b07573df3a.tar.xz netpbm-mirror-67291597b49a9b5b8f26ad7cb58932b07573df3a.zip |
Release 10.61.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@1832 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | doc/HISTORY | 13 | ||||
-rw-r--r-- | generator/pamstereogram.c | 5 | ||||
-rw-r--r-- | version.mk | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 84519513..3b6ab253 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,7 +4,18 @@ Netpbm. CHANGE HISTORY -------------- -12.12.30 BJH Release 10.61.00 +12.12.31 BJH Release 10.61.01 + + pamstereogram: change -guidesize default from 10 to 20 + (relevant since 10.61.00). + + pamstereogram: fix bug: doesn't reject negative guidesize. + Broken since 10.61.00. + + pamstereogram: fix bug: garbage in -verbose listing. Broken + since 10.61.00 + +12.12.31 BJH Release 10.61.00 pgmhist: Add -machine option. diff --git a/generator/pamstereogram.c b/generator/pamstereogram.c index 7ff427ed..ac71c702 100644 --- a/generator/pamstereogram.c +++ b/generator/pamstereogram.c @@ -178,7 +178,7 @@ parseCommandLine(int argc, &cmdlineP->guidetop, 0); OPTENT3(0, "guidebottom", OPT_FLAG, NULL, &cmdlineP->guidebottom, 0); - OPTENT3(0, "guidesize", OPT_INT, &cmdlineP->guidesize, + OPTENT3(0, "guidesize", OPT_UINT, &cmdlineP->guidesize, &guidesizeSpec, 0); OPTENT3(0, "magnifypat", OPT_UINT, &cmdlineP->magnifypat, &magnifypatSpec, 0); @@ -261,7 +261,7 @@ parseCommandLine(int argc, "without -guidetop or -guidebottom"); if (!guidesizeSpec) - cmdlineP->guidesize = 10; + cmdlineP->guidesize = 20; if (!magnifypatSpec) cmdlineP->magnifypat = 1; @@ -621,6 +621,7 @@ readTextureImage(struct cmdlineInfo const cmdline, if (cmdline.bgcolor && strcmp(colorname, cmdline.bgcolor)) pm_message("Texture background color: %s (%s)", cmdline.bgcolor, colorname); + else pm_message("Texture background color: %s", colorname); pm_strfree(colorname); } diff --git a/version.mk b/version.mk index ba00d26d..45f4b29a 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 61 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |