From 405f7ff39c9b3df549f52b02c1822e8144f79231 Mon Sep 17 00:00:00 2001 From: ellson Date: Mon, 15 Sep 2008 14:51:25 +0000 Subject: [PATCH] rename interpolate -> interpolate_pointf to avoid collision with interpolate in sfdpgen --- lib/common/geom.c | 2 +- lib/common/geomprocs.h | 2 +- lib/common/shapes.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/common/geom.c b/lib/common/geom.c index c0493f296..b885f7492 100644 --- 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 70fd5ef47..94ac01217 100644 --- 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 0935650a2..685f234db 100644 --- 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]; -- 2.40.0