diff options
| author | joye <joye> | 2014-06-27 19:49:47 (GMT) |
|---|---|---|
| committer | joye <joye> | 2014-06-27 19:49:47 (GMT) |
| commit | 90073c46c67c57a7387edb09643617d61450442d (patch) | |
| tree | 7286c5c3b559ac4aba2aa0b012473daf6779768c | |
| parent | c4a3b84067b9d6b74f339646069dfe8749a2cbca (diff) | |
| download | blt-90073c46c67c57a7387edb09643617d61450442d.zip blt-90073c46c67c57a7387edb09643617d61450442d.tar.gz blt-90073c46c67c57a7387edb09643617d61450442d.tar.bz2 | |
*** empty log message ***
| -rw-r--r-- | src/bltGrMisc.C | 12 | ||||
| -rw-r--r-- | src/bltGrMisc.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C index d15bef2..eb896c0 100644 --- a/src/bltGrMisc.C +++ b/src/bltGrMisc.C @@ -56,7 +56,7 @@ char* Blt::dupstr(const char* str) return copy; } -int Blt_PointInPolygon(Point2d *s, Point2d *points, int nPoints) +int Blt::PointInPolygon(Point2d *s, Point2d *points, int nPoints) { Point2d *p, *q, *qend; int count; @@ -116,7 +116,7 @@ static int ClipTest (double ds, double dr, double *t1, double *t2) * Line Clipping, ACM, TOG,3(1), 1984, pp.1-22. *--------------------------------------------------------------------------- */ -int Blt_LineRectClip(Region2d* regionPtr, Point2d *p, Point2d *q) +int Blt::LineRectClip(Region2d* regionPtr, Point2d *p, Point2d *q) { double t1, t2; double dx, dy; @@ -158,8 +158,8 @@ int Blt_LineRectClip(Region2d* regionPtr, Point2d *p, Point2d *q) #define AddVertex(vx, vy) r->x=(vx), r->y=(vy), r++, count++ #define LastVertex(vx, vy) r->x=(vx), r->y=(vy), count++ -int Blt_PolyRectClip(Region2d *regionPtr, Point2d *points, int nPoints, - Point2d *clipPts) +int Blt::PolyRectClip(Region2d *regionPtr, Point2d *points, int nPoints, + Point2d *clipPts) { Point2d *p; /* First vertex of input polygon edge. */ Point2d *pend; @@ -270,7 +270,7 @@ int Blt_PolyRectClip(Region2d *regionPtr, Point2d *points, int nPoints, * line. *--------------------------------------------------------------------------- */ -Point2d Blt_GetProjection(int x, int y, Point2d *p, Point2d *q) +Point2d Blt::GetProjection(int x, int y, Point2d *p, Point2d *q) { double dx = p->x - q->x; double dy = p->y - q->y; @@ -329,7 +329,7 @@ Point2d Blt_GetProjection(int x, int y, Point2d *p, Point2d *q) return t; } -Graph* Blt_GetGraphFromWindowData(Tk_Window tkwin) +Graph* Blt::GetGraphFromWindowData(Tk_Window tkwin) { while (tkwin) { TkWindow* winPtr = (TkWindow*)tkwin; diff --git a/src/bltGrMisc.h b/src/bltGrMisc.h index 948d1b9..63c8297 100644 --- a/src/bltGrMisc.h +++ b/src/bltGrMisc.h @@ -94,7 +94,7 @@ namespace Blt { int nInputPts, Point2d *outputPts); extern int LineRectClip(Region2d *regionPtr, Point2d *p, Point2d *q); extern Point2d GetProjection (int x, int y, Point2d *p, Point2d *q); - extern Graph* GetGraphFromWindowData(Tk_Window tkwin); + extern Graph* getGraphFromWindowData(Tk_Window tkwin); }; #endif |