about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2016-12-01 01:07:35 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2016-12-01 01:07:35 +0000
commit60b5be72d135ed2837b761a63409bdf76d946b10 (patch)
tree09e030cef925e48f2eff320746575a41ecf3af51
parent37fcd3da88c1292671c867756c117b64a69917d6 (diff)
downloadnetpbm-mirror-60b5be72d135ed2837b761a63409bdf76d946b10.tar.gz
netpbm-mirror-60b5be72d135ed2837b761a63409bdf76d946b10.tar.xz
netpbm-mirror-60b5be72d135ed2837b761a63409bdf76d946b10.zip
Release 10.73.05
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2845 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rw-r--r--editor/pnmpad.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index f7d49aa2..161c5a24 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+16.12.01 BJH  Release 10.73.05
+
+              pnmpad: fix bug: incorrect output width.  Introduced in
+              Netpbm 10.72 (July 2015).
+
 16.09.02 BJH  Release 10.73.05
 
               pnmquantall: Fix failure when temporary file location is
diff --git a/editor/pnmpad.c b/editor/pnmpad.c
index 168b73e0..051f3895 100644
--- a/editor/pnmpad.c
+++ b/editor/pnmpad.c
@@ -309,7 +309,7 @@ computePadSizeBeforeMult(unsigned int   const unpaddedSize,
             *begPadP = begPadReq;
             *endPadP = MAX(sizeReq, unpaddedSize + begPadReq) -
                 (begPadReq + unpaddedSize);
-        } else if (endPadReq) {
+        } else if (endPadSpec) {
             *endPadP = endPadReq;
             *begPadP = MAX(sizeReq, unpaddedSize + endPadReq) -
                 (unpaddedSize + endPadReq);