Fix bugs 456, 1199, 1160 abd 473.

diff --git a/lib/common/routespl.c b/lib/common/routespl.c
index 0ffc73a89a8cdf7ef8b8b3c6efa1a8400e8ce0b3..4ad87d31b92e2cd3b3d8c660aadf9ffdb11b7748 100644 (file)
--- a/lib/common/routespl.c
+++ b/lib/common/routespl.c
@@ -291,6 +291,7 @@ static point *_routesplines(path * pp, int *npoints, int polyline)
     int boxn;
     edge_t* realedge;
     int flip;
+    int delta = 10;
 
     nedges++;
     nboxes += pp->nbox;
@@ -504,7 +505,7 @@ static point *_routesplines(path * pp, int *npoints, int polyline)
 #endif
     }
     mkspacep(spl.pn);
-    for (bi = 0; bi <= boxn; bi++) {
+    for (bi = 0; bi < boxn; bi++) {
        boxes[bi].LL.x = INT_MAX;
        boxes[bi].UR.x = INT_MIN;
     }
@@ -512,9 +513,11 @@ static point *_routesplines(path * pp, int *npoints, int polyline)
        ps[splinepi].x = spl.ps[splinepi].x;
        ps[splinepi].y = spl.ps[splinepi].y;
     }
+REDO:
     for (splinepi = 0; splinepi + 3 < spl.pn; splinepi += 3) {
-       for (si = 0; si <= 10 * boxn; si++) {
-           t = si / (10.0 * boxn);
+       int num_div = delta * boxn;
+       for (si = 0; si <= num_div; si++) {
+           t = si / ((double)num_div);
            sp[0] = ps[splinepi];
            sp[1] = ps[splinepi + 1];
            sp[2] = ps[splinepi + 2];
@@ -541,6 +544,17 @@ static point *_routesplines(path * pp, int *npoints, int polyline)
            }
        }
     }
+    /* The following check is necessary because if a box is not very 
+     * high, it is possible that the sampling above might miss it.
+     * Therefore, we make the sample finer until all boxes have
+     * valid values. cf. bug 456. Would making sp[] pointfs help?
+     */
+    for (bi = 0; bi < boxn; bi++) {
+       if ((boxes[bi].LL.x == INT_MAX) || (boxes[bi].UR.x == INT_MIN)) {
+           delta *= 2;
+           goto REDO;
+       }
+    }
     *npoints = spl.pn;
 
 #ifdef DEBUG