[Pcb-src-changes] pcb.git: branch: master updated (a6414f42162017e5962f25370e584e9164cf2949)

[<gi...@gp...>]

The branch, master has been updated
       via  a6414f42162017e5962f25370e584e9164cf2949 (commit)
      from  a3d422a89dd7aa2f6298cc8c284896284a029838 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/draw.c |   39 +++++++++------------------------------
 1 files changed, 9 insertions(+), 30 deletions(-)


=================
 Commit Messages
=================

commit a6414f42162017e5962f25370e584e9164cf2949
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>

    draw.c: Move DrawPlainPin and DrawPlainVia into their only callers
    
    Make their code part of pin_callback and via_callback.
    
    Drop the Gathering tests within this code, as their only callers are
    within a block where Gathering is definately set.

:100644 100644 8b73644... 09e183e... M	src/draw.c

=========
 Changes
=========

commit a6414f42162017e5962f25370e584e9164cf2949
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>

    draw.c: Move DrawPlainPin and DrawPlainVia into their only callers
    
    Make their code part of pin_callback and via_callback.
    
    Drop the Gathering tests within this code, as their only callers are
    within a block where Gathering is definately set.

diff --git a/src/draw.c b/src/draw.c
index 8b73644..09e183e 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -84,8 +84,6 @@ static void DrawEverything (BoxTypePtr);
 static void DrawPPV (int group, const BoxType *);
 static int DrawLayerGroup (int, const BoxType *);
 static void DrawPinOrViaLowLevel (PinTypePtr, bool);
-static void DrawPlainPin (PinTypePtr, bool);
-static void DrawPlainVia (PinTypePtr, bool);
 static void DrawPinOrViaNameLowLevel (PinTypePtr);
 static void DrawPadLowLevel (hidGC, PadTypePtr, bool, bool);
 static void DrawPadNameLowLevel (PadTypePtr);
@@ -460,14 +458,21 @@ static int
 via_callback (const BoxType * b, void *cl)
 {
   PinTypePtr via = (PinTypePtr) b;
-  DrawPlainVia (via, false);
+  SetPVColor (via, VIA_TYPE);
+  DrawPinOrViaLowLevel (via, false);
+  if (!TEST_FLAG (HOLEFLAG, via) && TEST_FLAG (DISPLAYNAMEFLAG, via))
+    DrawPinOrViaNameLowLevel (via);
   return 1;
 }
 
 static int
 pin_callback (const BoxType * b, void *cl)
 {
-  DrawPlainPin ((PinTypePtr) b, false);
+  PinTypePtr pin = (PinTypePtr) b;
+  SetPVColor (pin, PIN_TYPE);
+  DrawPinOrViaLowLevel (pin, false);
+  if (!TEST_FLAG (HOLEFLAG, pin) && TEST_FLAG (DISPLAYNAMEFLAG, pin))
+    DrawPinOrViaNameLowLevel (pin);
   return 1;
 }
 
@@ -1180,19 +1185,6 @@ DrawVia (PinTypePtr Via)
 }
 
 /* ---------------------------------------------------------------------------
- * draw a via without dealing with polygon clearance 
- */
-static void
-DrawPlainVia (PinTypePtr Via, bool holeToo)
-{
-  if (!Gathering)
-    SetPVColor (Via, VIA_TYPE);
-  DrawPinOrViaLowLevel (Via, holeToo);
-  if (!TEST_FLAG (HOLEFLAG, Via) && TEST_FLAG (DISPLAYNAMEFLAG, Via))
-    DrawPinOrViaNameLowLevel (Via);
-}
-
-/* ---------------------------------------------------------------------------
  * draws the name of a via
  */
 void
@@ -1225,19 +1217,6 @@ DrawPin (PinTypePtr Pin)
 }
 
 /* ---------------------------------------------------------------------------
- * draw a pin without clearing around polygons 
- */
-static void
-DrawPlainPin (PinTypePtr Pin, bool holeToo)
-{
-  if (!Gathering)
-    SetPVColor (Pin, PIN_TYPE);
-  DrawPinOrViaLowLevel (Pin, holeToo);
-  if (!TEST_FLAG (HOLEFLAG, Pin) && TEST_FLAG (DISPLAYNAMEFLAG, Pin))
-    DrawPinOrViaNameLowLevel (Pin);
-}
-
-/* ---------------------------------------------------------------------------
  * draws the name of a pin
  */
 void