diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-10-26 18:48:13 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-10-26 18:48:13 +0000 |
commit | 5806c5c500d7f4c995bd148a67460e8b36eeb0d9 (patch) | |
tree | 8b1f363afcdc56745acd5c53749c7ecca6b58d33 | |
parent | 97e0fd8ab1be6759068456a1f518458acab5a6f5 (diff) | |
download | netpbm-mirror-5806c5c500d7f4c995bd148a67460e8b36eeb0d9.tar.gz netpbm-mirror-5806c5c500d7f4c995bd148a67460e8b36eeb0d9.tar.xz netpbm-mirror-5806c5c500d7f4c995bd148a67460e8b36eeb0d9.zip |
Fix bug: wrong detection of relationship between corner points with -quad
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4157 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | doc/HISTORY | 11 | ||||
-rw-r--r-- | editor/pamrubber.c | 8 |
2 files changed, 14 insertions, 5 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 5434f56a..a1910249 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -11,6 +11,15 @@ not yet BJH Release 10.97.00 pamtogif: Fix bug: doesn't ignore the input alpha mask when user specified -transparent. Broken in Netpbm 10.37 (December 2006). + pamrubber: Fix bug: random behavior with -quad when you specify + both points for source or target and the second one is lower in + the image than the first. Always broken (Pamrubber was new in + Netpbm 10.54 (March 2011)). + + libnetpbm: When validating computable size of width and height, + allow for adding up to 10 instead of 2, to account for rounding + up to a multiple of 8 in processing bit maps. + 21.09.25 BJH Release 10.96.00 pgmtoppm: Eliminate dependency on color dictionary when user @@ -340,7 +349,7 @@ not yet BJH Release 10.97.00 than just pick one. pamrubber: Fix bug: -frame doesn't work. Always broken. - (Pamrubber was new in Netpbm 10.54 (March 2011). + (Pamrubber was new in Netpbm 10.54 (March 2011)). 19.09.28 BJH Release 10.88.00 diff --git a/editor/pamrubber.c b/editor/pamrubber.c index fda31203..802d8c20 100644 --- a/editor/pamrubber.c +++ b/editor/pamrubber.c @@ -1014,10 +1014,10 @@ prepQuad(void) { } else if ((oldCP[0].x > oldCP[1].x) && (oldCP[0].y < oldCP[1].y)) { /* top-right and bottom-left */ quad1 = quadRect(oldCP[1].x, oldCP[0].x, oldCP[0].y, oldCP[1].y); - } else if ((oldCP[0].x < oldCP[1].x) && (oldCP[0].y < oldCP[1].y)) { + } else if ((oldCP[0].x < oldCP[1].x) && (oldCP[0].y > oldCP[1].y)) { /* bottom-left and top-right */ quad1 = quadRect(oldCP[0].x, oldCP[1].x, oldCP[1].y, oldCP[0].y); - } else if ((oldCP[0].x > oldCP[1].x) && (oldCP[0].y < oldCP[1].y)) { + } else if ((oldCP[0].x > oldCP[1].x) && (oldCP[0].y > oldCP[1].y)) { /* bottom-right and top-left */ quad1 = quadRect(oldCP[1].x, oldCP[0].x, oldCP[1].y, oldCP[0].y); } @@ -1028,10 +1028,10 @@ prepQuad(void) { } else if ((newCP[0].x > newCP[1].x) && (newCP[0].y < newCP[1].y)) { /* top-right and bottom-left */ quad2 = quadRect(newCP[1].x, newCP[0].x, newCP[0].y, newCP[1].y); - } else if ((newCP[0].x < newCP[1].x) && (newCP[0].y < newCP[1].y)) { + } else if ((newCP[0].x < newCP[1].x) && (newCP[0].y > newCP[1].y)) { /* bottom-left and top-right */ quad2 = quadRect(newCP[0].x, newCP[1].x, newCP[1].y, newCP[0].y); - } else if ((newCP[0].x > newCP[1].x) && (newCP[0].y < newCP[1].y)) { + } else if ((newCP[0].x > newCP[1].x) && (newCP[0].y > newCP[1].y)) { /* bottom-right and top-left */ quad2 = quadRect(newCP[1].x, newCP[0].x, newCP[1].y, newCP[0].y); } |