rename interpolate -> interpolate_pointf to avoid collision with interpolate in sfdpgen

diff --git a/lib/common/geom.c b/lib/common/geom.c
index c0493f29668fd507e21ec371994ae2b4bc01462a..b885f7492e4cd41235f4bea22eeedc1d0c53f9eb 100644 (file)
--- a/lib/common/geom.c
+++ b/lib/common/geom.c
@@ -171,7 +171,7 @@ inline pointf mid_pointf(pointf p, pointf q)
     return r;
 }
 
-inline pointf interpolate(double t, pointf p, pointf q)
+inline pointf interpolate_pointf(double t, pointf p, pointf q)
 {
     pointf r; 
 

diff --git a/lib/common/geomprocs.h b/lib/common/geomprocs.h
index 70fd5ef47fc3a064a786184405d50d5fb5ad7e86..94ac0121779f786794f14306f4cf7d3ba5c37b4b 100644 (file)
--- a/lib/common/geomprocs.h
+++ b/lib/common/geomprocs.h
@@ -41,7 +41,7 @@ extern pointf sub_pointf(pointf p, pointf q);
 extern point mid_point(point p, point q);
 extern pointf mid_pointf(pointf p, pointf q);
 
-extern pointf interpolate(double t, pointf p, pointf q);
+extern pointf interpolate_pointf(double t, pointf p, pointf q);
 
 extern point exch_xy(point p);
 extern pointf exch_xyf(pointf p);

diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index 0935650a2e8963c41385cd091812de5e5868705a..685f234dbfeb21aa28c57990cbd6d4e92dcf4142 100644 (file)
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -411,11 +411,11 @@ void round_corners(GVJ_t * job, char* fillc, char* penc, pointf * AF,
        if (mode != ROUNDED)
            B[i++] = p0;
        if (mode == ROUNDED)
-           B[i++] = interpolate(RBCURVE * t, p0, p1);
-       B[i++] = interpolate(t, p0, p1);
-       B[i++] = interpolate(1.0 - t, p0, p1);
+           B[i++] = interpolate_pointf(RBCURVE * t, p0, p1);
+       B[i++] = interpolate_pointf(t, p0, p1);
+       B[i++] = interpolate_pointf(1.0 - t, p0, p1);
        if (mode == ROUNDED)
-           B[i++] = interpolate(1.0 - RBCURVE * t, p0, p1);
+           B[i++] = interpolate_pointf(1.0 - RBCURVE * t, p0, p1);
     }
     B[i++] = B[0];
     B[i++] = B[1];