about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2019-12-25 19:31:31 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2019-12-25 19:31:31 +0000
commit278e20580cc2a30ee5b055192868617bb0d102de (patch)
tree6299fa192d28b4ecff05dc713d4178c6fbf6279a
parent61904ede12e6d14724204f97f863c19fdc10d1e4 (diff)
downloadnetpbm-mirror-278e20580cc2a30ee5b055192868617bb0d102de.tar.gz
netpbm-mirror-278e20580cc2a30ee5b055192868617bb0d102de.tar.xz
netpbm-mirror-278e20580cc2a30ee5b055192868617bb0d102de.zip
Release 10.86.08
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@3718 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rw-r--r--editor/pamrubber.c6
-rw-r--r--version.mk2
3 files changed, 9 insertions, 4 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index a2a1a52f..186c5289 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+12.12.25 BJH  Release 10.86.08
+
+              pamrubber: Fix bug: -frame doesn't work.  Always broken.
+              (Pamrubber was new in Netpbm 10.54 (March 2011).
+
 19.12.03 BJH  Release 10.86.07
 
               anytopnm: Fix unpredictable behavior when file name contains
diff --git a/editor/pamrubber.c b/editor/pamrubber.c
index e7abd789..a5748104 100644
--- a/editor/pamrubber.c
+++ b/editor/pamrubber.c
@@ -675,7 +675,7 @@ clippedPoint(const struct pam * const pamP,
              point              const p) {
 
     int const roundedX = ROUND(p.x);
-    int const roundedY = ROUND(p.x);
+    int const roundedY = ROUND(p.y);
 
     int clippedX, clippedY;
 
@@ -691,8 +691,8 @@ clippedPoint(const struct pam * const pamP,
         
     if (roundedY <= 0)
         clippedY = 1;
-    else if (roundedY > pamP->width - 1)
-        clippedY = pamP->width - 2;
+    else if (roundedY > pamP->height - 1)
+        clippedY = pamP->height - 2;
     else
         clippedY = roundedY;
         
diff --git a/version.mk b/version.mk
index ecef0485..b5c2c0f3 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 86
-NETPBM_POINT_RELEASE = 7
+NETPBM_POINT_RELEASE = 8