[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (28615144fe07bb028a36427ad434f5c2bf9a9ece)
The branch, master has been updated
via 28615144fe07bb028a36427ad434f5c2bf9a9ece (commit)
via 2321cc2f73e3148484f43fd6013c2ac2d223d21e (commit)
from bb23c2776daf072fa7eed46b2328f29d27d62de8 (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/buffer.c | 86 +++++++++++++++++++++++++++---------------------------
src/move.c | 92 +++++++++++++++++++++++++++++-----------------------------
2 files changed, 89 insertions(+), 89 deletions(-)
=================
Commit Messages
=================
commit 28615144fe07bb028a36427ad434f5c2bf9a9ece
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
src/move.c: Gratuitous cosmetic changes
Split from a future patch which ended up making these changes to help
with consistency. Pre-patching here to avoid a huge delta when that
patch lands.
:100644 100644 0c24c90... ecc5928... M src/move.c
commit 2321cc2f73e3148484f43fd6013c2ac2d223d21e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
src/buffer.c: More cosmetic changes
:100644 100644 f3fa18a... ec7f538... M src/buffer.c
=========
Changes
=========
commit 28615144fe07bb028a36427ad434f5c2bf9a9ece
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
src/move.c: Gratuitous cosmetic changes
Split from a future patch which ended up making these changes to help
with consistency. Pre-patching here to avoid a huge delta when that
patch lands.
diff --git a/src/move.c b/src/move.c
index 0c24c90..ecc5928 100644
--- a/src/move.c
+++ b/src/move.c
@@ -117,7 +117,7 @@ MoveElementLowLevel (DataTypePtr Data, ElementTypePtr Element,
LocationType DX, LocationType DY)
{
if (Data)
- r_delete_entry (Data->element_tree, (BoxType *) Element);
+ r_delete_entry (Data->element_tree, (BoxType *)Element);
ELEMENTLINE_LOOP (Element);
{
MOVE_LINE_LOWLEVEL (line, DX, DY);
@@ -127,13 +127,13 @@ MoveElementLowLevel (DataTypePtr Data, ElementTypePtr Element,
{
if (Data)
{
- r_delete_entry (Data->pin_tree, (BoxType *) pin);
+ r_delete_entry (Data->pin_tree, (BoxType *)pin);
RestoreToPolygon (Data, PIN_TYPE, Element, pin);
}
MOVE_PIN_LOWLEVEL (pin, DX, DY);
if (Data)
{
- r_insert_entry (Data->pin_tree, (BoxType *) pin, 0);
+ r_insert_entry (Data->pin_tree, (BoxType *)pin, 0);
ClearFromPolygon (Data, PIN_TYPE, Element, pin);
}
}
@@ -142,13 +142,13 @@ MoveElementLowLevel (DataTypePtr Data, ElementTypePtr Element,
{
if (Data)
{
- r_delete_entry (Data->pad_tree, (BoxType *) pad);
+ r_delete_entry (Data->pad_tree, (BoxType *)pad);
RestoreToPolygon (Data, PAD_TYPE, Element, pad);
}
MOVE_PAD_LOWLEVEL (pad, DX, DY);
if (Data)
{
- r_insert_entry (Data->pad_tree, (BoxType *) pad, 0);
+ r_insert_entry (Data->pad_tree, (BoxType *)pad, 0);
ClearFromPolygon (Data, PAD_TYPE, Element, pad);
}
}
@@ -161,17 +161,17 @@ MoveElementLowLevel (DataTypePtr Data, ElementTypePtr Element,
ELEMENTTEXT_LOOP (Element);
{
if (Data && Data->name_tree[n])
- r_delete_entry (PCB->Data->name_tree[n], (BoxType *) text);
+ r_delete_entry (PCB->Data->name_tree[n], (BoxType *)text);
MOVE_TEXT_LOWLEVEL (text, DX, DY);
if (Data && Data->name_tree[n])
- r_insert_entry (PCB->Data->name_tree[n], (BoxType *) text, 0);
+ r_insert_entry (PCB->Data->name_tree[n], (BoxType *)text, 0);
}
END_LOOP;
MOVE_BOX_LOWLEVEL (&Element->BoundingBox, DX, DY);
MOVE_BOX_LOWLEVEL (&Element->VBox, DX, DY);
MOVE (Element->MarkX, Element->MarkY, DX, DY);
if (Data)
- r_insert_entry (Data->element_tree, (BoxType *) Element, 0);
+ r_insert_entry (Data->element_tree, (BoxType *)Element, 0);
}
/* ----------------------------------------------------------------------
@@ -186,10 +186,10 @@ MoveElementName (ElementTypePtr Element)
ELEMENTTEXT_LOOP (Element);
{
if (PCB->Data->name_tree[n])
- r_delete_entry (PCB->Data->name_tree[n], (BoxType *) text);
+ r_delete_entry (PCB->Data->name_tree[n], (BoxType *)text);
MOVE_TEXT_LOWLEVEL (text, DeltaX, DeltaY);
if (PCB->Data->name_tree[n])
- r_insert_entry (PCB->Data->name_tree[n], (BoxType *) text, 0);
+ r_insert_entry (PCB->Data->name_tree[n], (BoxType *)text, 0);
}
END_LOOP;
DrawElementName (Element);
@@ -200,10 +200,10 @@ MoveElementName (ElementTypePtr Element)
ELEMENTTEXT_LOOP (Element);
{
if (PCB->Data->name_tree[n])
- r_delete_entry (PCB->Data->name_tree[n], (BoxType *) text);
+ r_delete_entry (PCB->Data->name_tree[n], (BoxType *)text);
MOVE_TEXT_LOWLEVEL (text, DeltaX, DeltaY);
if (PCB->Data->name_tree[n])
- r_insert_entry (PCB->Data->name_tree[n], (BoxType *) text, 0);
+ r_insert_entry (PCB->Data->name_tree[n], (BoxType *)text, 0);
}
END_LOOP;
}
@@ -248,12 +248,12 @@ MoveElement (ElementTypePtr Element)
static void *
MoveVia (PinTypePtr Via)
{
- r_delete_entry (PCB->Data->via_tree, (BoxTypePtr) Via);
+ r_delete_entry (PCB->Data->via_tree, (BoxType *)Via);
RestoreToPolygon (PCB->Data, VIA_TYPE, Via, Via);
MOVE_VIA_LOWLEVEL (Via, DeltaX, DeltaY);
if (PCB->ViaOn)
EraseVia (Via);
- r_insert_entry (PCB->Data->via_tree, (BoxTypePtr) Via, 0);
+ r_insert_entry (PCB->Data->via_tree, (BoxType *)Via, 0);
ClearFromPolygon (PCB->Data, VIA_TYPE, Via, Via);
if (PCB->ViaOn)
{
@@ -272,9 +272,9 @@ MoveLine (LayerTypePtr Layer, LineTypePtr Line)
if (Layer->On)
EraseLine (Line);
RestoreToPolygon (PCB->Data, LINE_TYPE, Layer, Line);
- r_delete_entry (Layer->line_tree, (BoxTypePtr) Line);
+ r_delete_entry (Layer->line_tree, (BoxType *)Line);
MOVE_LINE_LOWLEVEL (Line, DeltaX, DeltaY);
- r_insert_entry (Layer->line_tree, (BoxTypePtr) Line, 0);
+ r_insert_entry (Layer->line_tree, (BoxType *)Line, 0);
ClearFromPolygon (PCB->Data, LINE_TYPE, Layer, Line);
if (Layer->On)
{
@@ -291,7 +291,7 @@ static void *
MoveArc (LayerTypePtr Layer, ArcTypePtr Arc)
{
RestoreToPolygon (PCB->Data, ARC_TYPE, Layer, Arc);
- r_delete_entry (Layer->arc_tree, (BoxTypePtr) Arc);
+ r_delete_entry (Layer->arc_tree, (BoxType *)Arc);
if (Layer->On)
{
EraseArc (Arc);
@@ -303,7 +303,7 @@ MoveArc (LayerTypePtr Layer, ArcTypePtr Arc)
{
MOVE_ARC_LOWLEVEL (Arc, DeltaX, DeltaY);
}
- r_insert_entry (Layer->arc_tree, (BoxTypePtr) Arc, 0);
+ r_insert_entry (Layer->arc_tree, (BoxType *)Arc, 0);
ClearFromPolygon (PCB->Data, ARC_TYPE, Layer, Arc);
return (Arc);
}
@@ -315,7 +315,7 @@ static void *
MoveText (LayerTypePtr Layer, TextTypePtr Text)
{
RestoreToPolygon (PCB->Data, TEXT_TYPE, Layer, Text);
- r_delete_entry (Layer->text_tree, (BoxTypePtr) Text);
+ r_delete_entry (Layer->text_tree, (BoxType *)Text);
if (Layer->On)
{
EraseText (Layer, Text);
@@ -325,7 +325,7 @@ MoveText (LayerTypePtr Layer, TextTypePtr Text)
}
else
MOVE_TEXT_LOWLEVEL (Text, DeltaX, DeltaY);
- r_insert_entry (Layer->text_tree, (BoxTypePtr) Text, 0);
+ r_insert_entry (Layer->text_tree, (BoxType *)Text, 0);
ClearFromPolygon (PCB->Data, TEXT_TYPE, Layer, Text);
return (Text);
}
@@ -355,9 +355,9 @@ MovePolygon (LayerTypePtr Layer, PolygonTypePtr Polygon)
{
ErasePolygon (Polygon);
}
- r_delete_entry (Layer->polygon_tree, (BoxType *) Polygon);
+ r_delete_entry (Layer->polygon_tree, (BoxType *)Polygon);
MovePolygonLowLevel (Polygon, DeltaX, DeltaY);
- r_insert_entry (Layer->polygon_tree, (BoxType *) Polygon, 0);
+ r_insert_entry (Layer->polygon_tree, (BoxType *)Polygon, 0);
InitClip (PCB->Data, Layer, Polygon);
if (Layer->On)
{
@@ -418,10 +418,10 @@ MovePolygonPoint (LayerTypePtr Layer, PolygonTypePtr Polygon,
{
ErasePolygon (Polygon);
}
- r_delete_entry (Layer->polygon_tree, (BoxType *) Polygon);
+ r_delete_entry (Layer->polygon_tree, (BoxType *)Polygon);
MOVE (Point->X, Point->Y, DeltaX, DeltaY);
SetPolygonBoundingBox (Polygon);
- r_insert_entry (Layer->polygon_tree, (BoxType *) Polygon, 0);
+ r_insert_entry (Layer->polygon_tree, (BoxType *)Polygon, 0);
RemoveExcessPolygonPoints (Layer, Polygon);
InitClip (PCB->Data, Layer, Polygon);
if (Layer->On)
@@ -436,12 +436,12 @@ MovePolygonPoint (LayerTypePtr Layer, PolygonTypePtr Polygon,
* moves a line between layers; lowlevel routines
*/
static void *
-MoveLineToLayerLowLevel (LayerTypePtr Source, LineTypePtr Line,
- LayerTypePtr Destination)
+MoveLineToLayerLowLevel (LayerType *Source, LineType *Line,
+ LayerType *Destination)
{
LineTypePtr newone = GetLineMemory (Destination);
- r_delete_entry (Source->line_tree, (BoxTypePtr) Line);
+ r_delete_entry (Source->line_tree, (BoxType *)Line);
/* copy the data and remove it from the former layer */
*newone = *Line;
*Line = Source->Line[--Source->LineN];
@@ -450,20 +450,20 @@ MoveLineToLayerLowLevel (LayerTypePtr Source, LineTypePtr Line,
memset (&Source->Line[Source->LineN], 0, sizeof (LineType));
if (!Destination->line_tree)
Destination->line_tree = r_create_tree (NULL, 0, 0);
- r_insert_entry (Destination->line_tree, (BoxTypePtr) newone, 0);
- return (newone);
+ r_insert_entry (Destination->line_tree, (BoxType *)newone, 0);
+ return newone;
}
/* ---------------------------------------------------------------------------
* moves an arc between layers; lowlevel routines
*/
static void *
-MoveArcToLayerLowLevel (LayerTypePtr Source, ArcTypePtr Arc,
- LayerTypePtr Destination)
+MoveArcToLayerLowLevel (LayerType *Source, ArcType *Arc,
+ LayerType *Destination)
{
ArcTypePtr newone = GetArcMemory (Destination);
- r_delete_entry (Source->arc_tree, (BoxTypePtr) Arc);
+ r_delete_entry (Source->arc_tree, (BoxType *)Arc);
/* copy the data and remove it from the former layer */
*newone = *Arc;
*Arc = Source->Arc[--Source->ArcN];
@@ -472,7 +472,7 @@ MoveArcToLayerLowLevel (LayerTypePtr Source, ArcTypePtr Arc,
memset (&Source->Arc[Source->ArcN], 0, sizeof (ArcType));
if (!Destination->arc_tree)
Destination->arc_tree = r_create_tree (NULL, 0, 0);
- r_insert_entry (Destination->arc_tree, (BoxTypePtr) newone, 0);
+ r_insert_entry (Destination->arc_tree, (BoxType *)newone, 0);
return (newone);
}
@@ -481,7 +481,7 @@ MoveArcToLayerLowLevel (LayerTypePtr Source, ArcTypePtr Arc,
* moves an arc between layers
*/
static void *
-MoveArcToLayer (LayerTypePtr Layer, ArcTypePtr Arc)
+MoveArcToLayer (LayerType *Layer, ArcType *Arc)
{
ArcTypePtr newone;
@@ -513,7 +513,7 @@ MoveArcToLayer (LayerTypePtr Layer, ArcTypePtr Arc)
* moves a line between layers
*/
static void *
-MoveRatToLayer (RatTypePtr Rat)
+MoveRatToLayer (RatType *Rat)
{
LineTypePtr newone;
//LocationType X1 = Rat->Point1.X, Y1 = Rat->Point1.Y;
@@ -569,7 +569,7 @@ moveline_callback (const BoxType * b, void *cl)
}
static void *
-MoveLineToLayer (LayerTypePtr Layer, LineTypePtr Line)
+MoveLineToLayer (LayerType *Layer, LineType *Line)
{
struct via_info info;
BoxType sb;
@@ -641,13 +641,13 @@ MoveLineToLayer (LayerTypePtr Layer, LineTypePtr Line)
* moves a text object between layers; lowlevel routines
*/
static void *
-MoveTextToLayerLowLevel (LayerTypePtr Source, TextTypePtr Text,
- LayerTypePtr Destination)
+MoveTextToLayerLowLevel (LayerType *Source, TextType *Text,
+ LayerType *Destination)
{
TextTypePtr newone = GetTextMemory (Destination);
RestoreToPolygon (PCB->Data, TEXT_TYPE, Source, Text);
- r_delete_entry (Source->text_tree, (BoxTypePtr) Text);
+ r_delete_entry (Source->text_tree, (BoxType *)Text);
/* copy the data and remove it from the former layer */
*newone = *Text;
*Text = Source->Text[--Source->TextN];
@@ -663,7 +663,7 @@ MoveTextToLayerLowLevel (LayerTypePtr Source, TextTypePtr Text,
SetTextBoundingBox (&PCB->Font, newone);
if (!Destination->text_tree)
Destination->text_tree = r_create_tree (NULL, 0, 0);
- r_insert_entry (Destination->text_tree, (BoxTypePtr) newone, 0);
+ r_insert_entry (Destination->text_tree, (BoxType *)newone, 0);
ClearFromPolygon (PCB->Data, TEXT_TYPE, Destination, newone);
return (newone);
}
@@ -672,7 +672,7 @@ MoveTextToLayerLowLevel (LayerTypePtr Source, TextTypePtr Text,
* moves a text object between layers
*/
static void *
-MoveTextToLayer (LayerTypePtr Layer, TextTypePtr Text)
+MoveTextToLayer (LayerType *Layer, TextType *Text)
{
TextTypePtr newone;
@@ -700,12 +700,12 @@ MoveTextToLayer (LayerTypePtr Layer, TextTypePtr Text)
* moves a polygon between layers; lowlevel routines
*/
static void *
-MovePolygonToLayerLowLevel (LayerTypePtr Source, PolygonTypePtr Polygon,
- LayerTypePtr Destination)
+MovePolygonToLayerLowLevel (LayerType *Source, PolygonType *Polygon,
+ LayerType *Destination)
{
PolygonTypePtr newone = GetPolygonMemory (Destination);
- r_delete_entry (Source->polygon_tree, (BoxType *) Polygon);
+ r_delete_entry (Source->polygon_tree, (BoxType *)Polygon);
/* copy the data and remove it from the former layer */
*newone = *Polygon;
*Polygon = Source->Polygon[--Source->PolygonN];
@@ -715,7 +715,7 @@ MovePolygonToLayerLowLevel (LayerTypePtr Source, PolygonTypePtr Polygon,
memset (&Source->Polygon[Source->PolygonN], 0, sizeof (PolygonType));
if (!Destination->polygon_tree)
Destination->polygon_tree = r_create_tree (NULL, 0, 0);
- r_insert_entry (Destination->polygon_tree, (BoxType *) newone, 0);
+ r_insert_entry (Destination->polygon_tree, (BoxType *)newone, 0);
return (newone);
}
@@ -748,7 +748,7 @@ mptl_pin_callback (const BoxType *b, void *cl)
* moves a polygon between layers
*/
static void *
-MovePolygonToLayer (LayerTypePtr Layer, PolygonTypePtr Polygon)
+MovePolygonToLayer (LayerType *Layer, PolygonType *Polygon)
{
PolygonTypePtr newone;
struct mptlc d;
commit 2321cc2f73e3148484f43fd6013c2ac2d223d21e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
src/buffer.c: More cosmetic changes
diff --git a/src/buffer.c b/src/buffer.c
index f3fa18a..ec7f538 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -241,7 +241,7 @@ MoveViaToBuffer (PinTypePtr Via)
PinTypePtr via;
RestoreToPolygon (Source, VIA_TYPE, Via, Via);
- r_delete_entry (Source->via_tree, (BoxType *) Via);
+ r_delete_entry (Source->via_tree, (BoxType *)Via);
via = GetViaMemory (Dest);
*via = *Via;
CLEAR_FLAG (WARNFLAG | FOUNDFLAG, via);
@@ -254,7 +254,7 @@ MoveViaToBuffer (PinTypePtr Via)
memset (&Source->Via[Source->ViaN], 0, sizeof (PinType));
if (!Dest->via_tree)
Dest->via_tree = r_create_tree (NULL, 0, 0);
- r_insert_entry (Dest->via_tree, (BoxType *) via, 0);
+ r_insert_entry (Dest->via_tree, (BoxType *)via, 0);
ClearFromPolygon (Dest, VIA_TYPE, via, via);
return (via);
}
@@ -267,7 +267,7 @@ MoveRatToBuffer (RatTypePtr Rat)
{
RatTypePtr rat;
- r_delete_entry (Source->rat_tree, &Rat->BoundingBox);
+ r_delete_entry (Source->rat_tree, (BoxType *)Rat);
rat = GetRatMemory (Dest);
*rat = *Rat;
CLEAR_FLAG (FOUNDFLAG, rat);
@@ -280,7 +280,7 @@ MoveRatToBuffer (RatTypePtr Rat)
memset (&Source->Rat[Source->RatN], 0, sizeof (RatType));
if (!Dest->rat_tree)
Dest->rat_tree = r_create_tree (NULL, 0, 0);
- r_insert_entry (Dest->rat_tree, &rat->BoundingBox, 0);
+ r_insert_entry (Dest->rat_tree, (BoxType *)rat, 0);
return (rat);
}
@@ -294,7 +294,7 @@ MoveLineToBuffer (LayerType *layer, LineType *Line)
LineTypePtr line;
RestoreToPolygon (Source, LINE_TYPE, layer, Line);
- r_delete_entry (layer->line_tree, (BoxTypePtr) Line);
+ r_delete_entry (layer->line_tree, (BoxType *)Line);
line = GetLineMemory (lay);
*line = *Line;
CLEAR_FLAG (FOUNDFLAG, line);
@@ -308,7 +308,7 @@ MoveLineToBuffer (LayerType *layer, LineType *Line)
memset (&layer->Line[layer->LineN], 0, sizeof (LineType));
if (!lay->line_tree)
lay->line_tree = r_create_tree (NULL, 0, 0);
- r_insert_entry (lay->line_tree, (BoxTypePtr) line, 0);
+ r_insert_entry (lay->line_tree, (BoxType *)line, 0);
ClearFromPolygon (Dest, LINE_TYPE, lay, line);
return (line);
}
@@ -323,7 +323,7 @@ MoveArcToBuffer (LayerType *layer, ArcType *Arc)
ArcTypePtr arc;
RestoreToPolygon (Source, ARC_TYPE, layer, Arc);
- r_delete_entry (layer->arc_tree, (BoxTypePtr) Arc);
+ r_delete_entry (layer->arc_tree, (BoxType *)Arc);
arc = GetArcMemory (lay);
*arc = *Arc;
CLEAR_FLAG (FOUNDFLAG, arc);
@@ -337,7 +337,7 @@ MoveArcToBuffer (LayerType *layer, ArcType *Arc)
memset (&layer->Arc[layer->ArcN], 0, sizeof (ArcType));
if (!lay->arc_tree)
lay->arc_tree = r_create_tree (NULL, 0, 0);
- r_insert_entry (lay->arc_tree, (BoxTypePtr) arc, 0);
+ r_insert_entry (lay->arc_tree, (BoxType *)arc, 0);
ClearFromPolygon (Dest, ARC_TYPE, lay, arc);
return (arc);
}
@@ -351,7 +351,7 @@ MoveTextToBuffer (LayerType *layer, TextType *Text)
LayerType *lay = &Dest->Layer[GetLayerNumber (Source, layer)];
TextTypePtr text;
- r_delete_entry (layer->text_tree, (BoxTypePtr) Text);
+ r_delete_entry (layer->text_tree, (BoxType *)Text);
RestoreToPolygon (Source, TEXT_TYPE, layer, Text);
text = GetTextMemory (lay);
*text = *Text;
@@ -364,7 +364,7 @@ MoveTextToBuffer (LayerType *layer, TextType *Text)
memset (&layer->Text[layer->TextN], 0, sizeof (TextType));
if (!lay->text_tree)
lay->text_tree = r_create_tree (NULL, 0, 0);
- r_insert_entry (lay->text_tree, (BoxTypePtr) text, 0);
+ r_insert_entry (lay->text_tree, (BoxType *)text, 0);
ClearFromPolygon (Dest, TEXT_TYPE, lay, text);
return (text);
}
@@ -378,7 +378,7 @@ MovePolygonToBuffer (LayerType *layer, PolygonType *Polygon)
LayerType *lay = &Dest->Layer[GetLayerNumber (Source, layer)];
PolygonTypePtr polygon;
- r_delete_entry (layer->polygon_tree, (BoxTypePtr) Polygon);
+ r_delete_entry (layer->polygon_tree, (BoxType *)Polygon);
polygon = GetPolygonMemory (lay);
*polygon = *Polygon;
CLEAR_FLAG (FOUNDFLAG, polygon);
@@ -392,7 +392,7 @@ MovePolygonToBuffer (LayerType *layer, PolygonType *Polygon)
memset (&layer->Polygon[layer->PolygonN], 0, sizeof (PolygonType));
if (!lay->polygon_tree)
lay->polygon_tree = r_create_tree (NULL, 0, 0);
- r_insert_entry (lay->polygon_tree, (BoxTypePtr) polygon, 0);
+ r_insert_entry (lay->polygon_tree, (BoxType *)polygon, 0);
return (polygon);
}
@@ -1239,10 +1239,10 @@ RotateBuffer (BufferTypePtr Buffer, BYTE Number)
/* rotate vias */
VIA_LOOP (Buffer->Data);
{
- r_delete_entry (Buffer->Data->via_tree, (BoxTypePtr) via);
+ r_delete_entry (Buffer->Data->via_tree, (BoxType *)via);
ROTATE_VIA_LOWLEVEL (via, Buffer->X, Buffer->Y, Number);
SetPinBoundingBox (via);
- r_insert_entry (Buffer->Data->via_tree, (BoxTypePtr) via, 0);
+ r_insert_entry (Buffer->Data->via_tree, (BoxType *)via, 0);
}
END_LOOP;
@@ -1257,30 +1257,30 @@ RotateBuffer (BufferTypePtr Buffer, BYTE Number)
/* all layer related objects */
ALLLINE_LOOP (Buffer->Data);
{
- r_delete_entry (layer->line_tree, (BoxTypePtr) line);
+ r_delete_entry (layer->line_tree, (BoxType *)line);
RotateLineLowLevel (line, Buffer->X, Buffer->Y, Number);
- r_insert_entry (layer->line_tree, (BoxTypePtr) line, 0);
+ r_insert_entry (layer->line_tree, (BoxType *)line, 0);
}
ENDALL_LOOP;
ALLARC_LOOP (Buffer->Data);
{
- r_delete_entry (layer->arc_tree, (BoxTypePtr) arc);
+ r_delete_entry (layer->arc_tree, (BoxType *)arc);
RotateArcLowLevel (arc, Buffer->X, Buffer->Y, Number);
- r_insert_entry (layer->arc_tree, (BoxTypePtr) arc, 0);
+ r_insert_entry (layer->arc_tree, (BoxType *)arc, 0);
}
ENDALL_LOOP;
ALLTEXT_LOOP (Buffer->Data);
{
- r_delete_entry (layer->text_tree, (BoxTypePtr) text);
+ r_delete_entry (layer->text_tree, (BoxType *)text);
RotateTextLowLevel (text, Buffer->X, Buffer->Y, Number);
- r_insert_entry (layer->text_tree, (BoxTypePtr) text, 0);
+ r_insert_entry (layer->text_tree, (BoxType *)text, 0);
}
ENDALL_LOOP;
ALLPOLYGON_LOOP (Buffer->Data);
{
- r_delete_entry (layer->polygon_tree, (BoxTypePtr) polygon);
+ r_delete_entry (layer->polygon_tree, (BoxType *)polygon);
RotatePolygonLowLevel (polygon, Buffer->X, Buffer->Y, Number);
- r_insert_entry (layer->polygon_tree, (BoxTypePtr) polygon, 0);
+ r_insert_entry (layer->polygon_tree, (BoxType *)polygon, 0);
}
ENDALL_LOOP;
@@ -1317,7 +1317,7 @@ FreeRotateElementLowLevel (DataTypePtr Data, ElementTypePtr Element,
ELEMENTTEXT_LOOP (Element);
{
if (Data && Data->name_tree[n])
- r_delete_entry (Data->name_tree[n], (BoxType *) text);
+ r_delete_entry (Data->name_tree[n], (BoxType *)text);
RotateTextLowLevel (text, X, Y, Number);
}
END_LOOP;
@@ -1333,7 +1333,7 @@ FreeRotateElementLowLevel (DataTypePtr Data, ElementTypePtr Element,
{
/* pre-delete the pins from the pin-tree before their coordinates change */
if (Data)
- r_delete_entry (Data->pin_tree, (BoxType *) pin);
+ r_delete_entry (Data->pin_tree, (BoxType *)pin);
RestoreToPolygon (Data, PIN_TYPE, Element, pin);
free_rotate (&pin->X, &pin->Y, X, Y, cosa, sina);
SetPinBoundingBox (pin);
@@ -1343,7 +1343,7 @@ FreeRotateElementLowLevel (DataTypePtr Data, ElementTypePtr Element,
{
/* pre-delete the pads before their coordinates change */
if (Data)
- r_delete_entry (Data->pad_tree, (BoxType *) pad);
+ r_delete_entry (Data->pad_tree, (BoxType *)pad);
RestoreToPolygon (Data, PAD_TYPE, Element, pad);
free_rotate (&pad->Point1.X, &pad->Point1.Y, X, Y, cosa, sina);
free_rotate (&pad->Point2.X, &pad->Point2.Y, X, Y, cosa, sina);
@@ -1374,10 +1374,10 @@ FreeRotateBuffer (BufferTypePtr Buffer, double Angle)
/* rotate vias */
VIA_LOOP (Buffer->Data);
{
- r_delete_entry (Buffer->Data->via_tree, (BoxTypePtr) via);
+ r_delete_entry (Buffer->Data->via_tree, (BoxType *)via);
free_rotate (&via->X, &via->Y, Buffer->X, Buffer->Y, cosa, sina);
SetPinBoundingBox (via);
- r_insert_entry (Buffer->Data->via_tree, (BoxTypePtr) via, 0);
+ r_insert_entry (Buffer->Data->via_tree, (BoxType *)via, 0);
}
END_LOOP;
@@ -1392,33 +1392,33 @@ FreeRotateBuffer (BufferTypePtr Buffer, double Angle)
/* all layer related objects */
ALLLINE_LOOP (Buffer->Data);
{
- r_delete_entry (layer->line_tree, (BoxTypePtr) line);
+ r_delete_entry (layer->line_tree, (BoxType *)line);
free_rotate (&line->Point1.X, &line->Point1.Y, Buffer->X, Buffer->Y, cosa, sina);
free_rotate (&line->Point2.X, &line->Point2.Y, Buffer->X, Buffer->Y, cosa, sina);
SetLineBoundingBox (line);
- r_insert_entry (layer->line_tree, (BoxTypePtr) line, 0);
+ r_insert_entry (layer->line_tree, (BoxType *)line, 0);
}
ENDALL_LOOP;
ALLARC_LOOP (Buffer->Data);
{
- r_delete_entry (layer->arc_tree, (BoxTypePtr) arc);
+ r_delete_entry (layer->arc_tree, (BoxType *)arc);
free_rotate (&arc->X, &arc->Y, Buffer->X, Buffer->Y, cosa, sina);
arc->StartAngle += Angle;
arc->StartAngle %= 360;
- r_insert_entry (layer->arc_tree, (BoxTypePtr) arc, 0);
+ r_insert_entry (layer->arc_tree, (BoxType *)arc, 0);
}
ENDALL_LOOP;
/* FIXME: rotate text */
ALLPOLYGON_LOOP (Buffer->Data);
{
- r_delete_entry (layer->polygon_tree, (BoxTypePtr) polygon);
+ r_delete_entry (layer->polygon_tree, (BoxType *)polygon);
POLYGONPOINT_LOOP (polygon);
{
free_rotate (&point->X, &point->Y, Buffer->X, Buffer->Y, cosa, sina);
}
END_LOOP;
SetPolygonBoundingBox (polygon);
- r_insert_entry (layer->polygon_tree, (BoxTypePtr) polygon, 0);
+ r_insert_entry (layer->polygon_tree, (BoxType *)polygon, 0);
}
ENDALL_LOOP;
@@ -1562,38 +1562,38 @@ SwapBuffer (BufferTypePtr Buffer)
Buffer->Y = SWAP_Y (Buffer->Y);
VIA_LOOP (Buffer->Data);
{
- r_delete_entry (Buffer->Data->via_tree, (BoxTypePtr) via);
+ r_delete_entry (Buffer->Data->via_tree, (BoxType *)via);
via->X = SWAP_X (via->X);
via->Y = SWAP_Y (via->Y);
SetPinBoundingBox (via);
- r_insert_entry (Buffer->Data->via_tree, (BoxTypePtr) via, 0);
+ r_insert_entry (Buffer->Data->via_tree, (BoxType *)via, 0);
}
END_LOOP;
ALLLINE_LOOP (Buffer->Data);
{
- r_delete_entry (layer->line_tree, (BoxTypePtr) line);
+ r_delete_entry (layer->line_tree, (BoxType *)line);
line->Point1.X = SWAP_X (line->Point1.X);
line->Point1.Y = SWAP_Y (line->Point1.Y);
line->Point2.X = SWAP_X (line->Point2.X);
line->Point2.Y = SWAP_Y (line->Point2.Y);
SetLineBoundingBox (line);
- r_insert_entry (layer->line_tree, (BoxTypePtr) line, 0);
+ r_insert_entry (layer->line_tree, (BoxType *)line, 0);
}
ENDALL_LOOP;
ALLARC_LOOP (Buffer->Data);
{
- r_delete_entry (layer->arc_tree, (BoxTypePtr) arc);
+ r_delete_entry (layer->arc_tree, (BoxType *)arc);
arc->X = SWAP_X (arc->X);
arc->Y = SWAP_Y (arc->Y);
arc->StartAngle = SWAP_ANGLE (arc->StartAngle);
arc->Delta = SWAP_DELTA (arc->Delta);
SetArcBoundingBox (arc);
- r_insert_entry (layer->arc_tree, (BoxTypePtr) arc, 0);
+ r_insert_entry (layer->arc_tree, (BoxType *)arc, 0);
}
ENDALL_LOOP;
ALLPOLYGON_LOOP (Buffer->Data);
{
- r_delete_entry (layer->polygon_tree, (BoxTypePtr) polygon);
+ r_delete_entry (layer->polygon_tree, (BoxType *)polygon);
POLYGONPOINT_LOOP (polygon);
{
point->X = SWAP_X (point->X);
@@ -1601,18 +1601,18 @@ SwapBuffer (BufferTypePtr Buffer)
}
END_LOOP;
SetPolygonBoundingBox (polygon);
- r_insert_entry (layer->polygon_tree, (BoxTypePtr) polygon, 0);
+ r_insert_entry (layer->polygon_tree, (BoxType *)polygon, 0);
/* hmmm, how to handle clip */
}
ENDALL_LOOP;
ALLTEXT_LOOP (Buffer->Data);
{
- r_delete_entry (layer->text_tree, (BoxTypePtr) text);
+ r_delete_entry (layer->text_tree, (BoxType *)text);
text->X = SWAP_X (text->X);
text->Y = SWAP_Y (text->Y);
TOGGLE_FLAG (ONSOLDERFLAG, text);
SetTextBoundingBox (&PCB->Font, text);
- r_insert_entry (layer->text_tree, (BoxTypePtr) text, 0);
+ r_insert_entry (layer->text_tree, (BoxType *)text, 0);
}
ENDALL_LOOP;
/* swap silkscreen layers */
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs