From c2dc78471d3e5377df3776e54aa0b35aa3170233 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Wed, 25 Dec 2019 19:25:29 +0000 Subject: Release 10.73.30 git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@3716 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- doc/HISTORY | 5 +++++ editor/pamrubber.c | 6 +++--- version.mk | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/HISTORY b/doc/HISTORY index 202d038e..0bb64576 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +not yet BJH Release 10.73.30 + + pamrubber: Fix bug: -frame doesn't work. Always broken. + (Pamrubber was new in Netpbm 10.54 (March 2011). + 19.09.28 BJH Release 10.73.29 jpeg2ktopam, pamtojpeg2k: fix negative array index. Always diff --git a/editor/pamrubber.c b/editor/pamrubber.c index 4378c340..1890ac58 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 9cc9e45e..d47296cb 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 73 -NETPBM_POINT_RELEASE = 29 +NETPBM_POINT_RELEASE = 30 -- cgit 1.4.1