about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-11-14 00:41:37 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-11-14 00:41:37 +0000
commit27ee1afa95561c5142d19cbee516fbc963743af4 (patch)
tree5c0b1050cf3a7d7d272b0fd49d1078234746adab
parent4e0e66d2042687ec422199c9663cbde10d4629d3 (diff)
downloadnetpbm-mirror-27ee1afa95561c5142d19cbee516fbc963743af4.tar.gz
netpbm-mirror-27ee1afa95561c5142d19cbee516fbc963743af4.tar.xz
netpbm-mirror-27ee1afa95561c5142d19cbee516fbc963743af4.zip
Release 11.04.04
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4784 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY4
-rw-r--r--editor/pnmpad.c4
-rw-r--r--version.mk2
3 files changed, 9 insertions, 1 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index a766e579..4995ede5 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,10 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+23.11.14 BJH  Release 11.04.04
+
+              pnmpad: fix wrong results with old-style options (e.g. "-t50").
+
 23.10.24 BJH  Release 11.04.03
 
               pamtosvg: fix "zero determinant" failure.  Introduced in
diff --git a/editor/pnmpad.c b/editor/pnmpad.c
index 9fa9f9e6..0fff88d0 100644
--- a/editor/pnmpad.c
+++ b/editor/pnmpad.c
@@ -189,6 +189,10 @@ parseCommandLineOld(int argc, const char ** argv,
     cmdlineP->left = cmdlineP->right = cmdlineP->top = cmdlineP->bottom = 0;
     cmdlineP->xalign = cmdlineP->yalign = 0.5;
     cmdlineP->white = cmdlineP->verbose = FALSE;
+    cmdlineP->reportonly = FALSE;
+    cmdlineP->topSpec = cmdlineP->bottomSpec =
+        cmdlineP->leftSpec = cmdlineP->rightSpec = TRUE;
+    cmdlineP->mwidth = cmdlineP->mheight = 1;
 
     while (argc >= 2 && argv[1][0] == '-') {
         if (strcmp(argv[1]+1,"black") == 0) cmdlineP->white = FALSE;
diff --git a/version.mk b/version.mk
index f7e29654..ff707ef6 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 11
 NETPBM_MINOR_RELEASE = 4
-NETPBM_POINT_RELEASE = 3
+NETPBM_POINT_RELEASE = 4