From 73a5025a7df7e06044b871150c7ecff056fd0527 Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 22 Mar 2019 15:06:40 -0400 Subject: partial backout of zero value logscale merge --- generic/tkbltGrMisc.h | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/generic/tkbltGrMisc.h b/generic/tkbltGrMisc.h index 5c16dce..ba86b75 100644 --- a/generic/tkbltGrMisc.h +++ b/generic/tkbltGrMisc.h @@ -104,26 +104,6 @@ namespace Blt { int offset; } Dashes; - typedef enum { - CLIP_OUTSIDE = 0, - CLIP_INSIDE = 1 << 0, - CLIP_P = 1 << 1, - CLIP_Q = 1 << 2 - } LineRectClipResult; - - inline LineRectClipResult operator|(LineRectClipResult a, LineRectClipResult b) { - return static_cast(static_cast(a) | static_cast(b)); - } - - inline LineRectClipResult operator&(LineRectClipResult a, LineRectClipResult b) { - return static_cast(static_cast(a) & static_cast(b)); - } - - inline LineRectClipResult & operator|=(LineRectClipResult & rhs, LineRectClipResult v) { - rhs = rhs | v; - return rhs; - } - extern char* dupstr(const char*); extern Graph* getGraphFromWindowData(Tk_Window tkwin); @@ -131,7 +111,7 @@ namespace Blt { int nScreenPts); extern int polyRectClip(Region2d *extsPtr, Point2d *inputPts, int nInputPts, Point2d *outputPts); - extern LineRectClipResult lineRectClip(Region2d *regionPtr, Point2d *p, Point2d *q); + extern int lineRectClip(Region2d *regionPtr, Point2d *p, Point2d *q); extern Point2d getProjection (int x, int y, Point2d *p, Point2d *q); }; -- cgit v0.12