From 9fe9fc7c00423df7d5c925a8f0ba4582d2d7e2a9 Mon Sep 17 00:00:00 2001
From: dickelbeck <Unknown>
Date: Wed, 31 Oct 2007 17:44:51 +0000
Subject: [PATCH] fix macro to inline conversion
---
common/gr_basic.cpp | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/common/gr_basic.cpp b/common/gr_basic.cpp
index b817c36581..ad027f4e48 100644
--- a/common/gr_basic.cpp
+++ b/common/gr_basic.cpp
@@ -98,11 +98,15 @@ int GRMapY( int y )
}
-#define WHEN_OUTSIDE return
+#define WHEN_OUTSIDE return true;
#define WHEN_INSIDE
-static inline void clip_line( int& x1, int& y1, int& x2, int& y2 )
+/**
+ * Function clip_line
+ * @return bool - true when WHEN_OUTSIDE fires, else false.
+ */
+static inline bool clip_line( int& x1, int& y1, int& x2, int& y2 )
{
int temp;
@@ -197,6 +201,8 @@ static inline void clip_line( int& x1, int& y1, int& x2, int& y2 )
WHEN_INSIDE;
}
}
+
+ return false;
}
@@ -220,7 +226,8 @@ static void WinClipAndDrawLine( EDA_Rect* ClipBox, wxDC* DC,
xcliphi += width;
ycliphi += width;
- clip_line( x1, y1, x2, y2 );
+ if( clip_line( x1, y1, x2, y2 ) )
+ return;
}
GRSetColorPen( DC, Color, width );
@@ -673,7 +680,8 @@ void GRSCSegm( EDA_Rect* ClipBox, wxDC* DC, int x1, int y1, int x2, int y2, int
xcliphi += width;
ycliphi += width;
- clip_line( x1, y1, x2, y2 );
+ if( clip_line( x1, y1, x2, y2 ) )
+ return;
}