about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2019-12-25 19:32:08 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2019-12-25 19:32:08 +0000
commit7a53900f121af84c64eda0102d540aa9c9be63df (patch)
tree661ed732afa7c624735cbcac614165f85868361a
parent9e4a4ee87ac595f8f537dca090e89e118a3e7c9a (diff)
downloadnetpbm-mirror-7a53900f121af84c64eda0102d540aa9c9be63df.tar.gz
netpbm-mirror-7a53900f121af84c64eda0102d540aa9c9be63df.tar.xz
netpbm-mirror-7a53900f121af84c64eda0102d540aa9c9be63df.zip
Release 10.88.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3719 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 e3152157..66fa9cbe 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+19.12.25 BJH  Release 10.88.02
+
+              pamrubber: Fix bug: -frame doesn't work.  Always broken.
+              (Pamrubber was new in Netpbm 10.54 (March 2011).
+
 19.12.03 BJH  Release 10.88.01
 
               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 c72e47f1..1fd245ab 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 88
-NETPBM_POINT_RELEASE = 1
+NETPBM_POINT_RELEASE = 2