gEDA-cvs: pcb.git: branch: master updated (0974ee574ae018c1e83889ea934b3434e9d9c62a)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  0974ee574ae018c1e83889ea934b3434e9d9c62a (commit)
       via  965580eaa524b10b57cde5659c5fc502085b2268 (commit)
      from  e983c9691d2ee634fb8e97c6654f2cd7ba8c595c (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 |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)


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

commit 965580eaa524b10b57cde5659c5fc502085b2268
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    draw.c: Tidy up DrawEMark
    
    Changes are aimed to simplify the delta of a future patch relating
    to object storage. Moves indexed addressing of object structures to
    fewer places.

:100644 100644 9ebcba6... 5409249... M	src/draw.c

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

commit 965580eaa524b10b57cde5659c5fc502085b2268
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    draw.c: Tidy up DrawEMark
    
    Changes are aimed to simplify the delta of a future patch relating
    to object storage. Moves indexed addressing of object structures to
    fewer places.

diff --git a/src/draw.c b/src/draw.c
index 9ebcba6..5409249 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -774,10 +774,17 @@ DrawEMark (ElementTypePtr e, LocationType X, LocationType Y,
   if (!PCB->InvisibleObjectsOn && invisible)
     return;
 
-  if (e->PinN && mark_size > e->Pin[0].Thickness / 2)
-    mark_size = e->Pin[0].Thickness / 2;
-  if (e->PadN && mark_size > e->Pad[0].Thickness / 2)
-    mark_size = e->Pad[0].Thickness / 2;
+  if (e->PinN)
+    {
+      PinType *pin0 = &e->Pin[0];
+      mark_size = MIN (mark_size, pin0->Thickness / 2);
+    }
+
+  if (e->PadN)
+    {
+      PadType *pad0 = &e->Pad[0];
+      mark_size = MIN (mark_size, pad0->Thickness / 2);
+    }
 
   gui->set_color (Output.fgGC,
 		  invisible ? PCB->InvisibleMarkColor : PCB->ElementColor);




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs