Rework code dealing with struct range fixing many bugs

[empserver] / src / lib / common / xy.c

diff --git a/src/lib/common/xy.c b/src/lib/common/xy.c
index 09472f1a6217649d1ac7708a2e473f2db25a9e62..87f3f4adcee879c2609ac06565a6c8b00bce39f2 100644 (file)
--- a/src/lib/common/xy.c
+++ b/src/lib/common/xy.c
@@ -183,7 +183,7 @@ ynorm(coord y)
 int
 xyinrange(coord x, coord y, struct range *rp)
 {
-    if (rp->lx < rp->hx) {
+    if (rp->lx <= rp->hx) {
        /* xrange doesn't wrap */
        if (x < rp->lx || x > rp->hx)
            return 0;
@@ -191,7 +191,7 @@ xyinrange(coord x, coord y, struct range *rp)
        if (x < rp->lx && x > rp->hx)
            return 0;
     }
-    if (rp->ly < rp->hy) {
+    if (rp->ly <= rp->hy) {
        /* yrange doesn't wrap */
        if (y < rp->ly || y > rp->hy)
            return 0;