You can subscribe to this list here.
2003 |
Jan
|
Feb
(4) |
Mar
(5) |
Apr
|
May
(5) |
Jun
(30) |
Jul
(2) |
Aug
(18) |
Sep
(14) |
Oct
(7) |
Nov
(21) |
Dec
(44) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(63) |
Feb
(94) |
Mar
(54) |
Apr
(39) |
May
(34) |
Jun
(25) |
Jul
(10) |
Aug
(33) |
Sep
(16) |
Oct
(62) |
Nov
(12) |
Dec
(2) |
2005 |
Jan
(71) |
Feb
(8) |
Mar
(50) |
Apr
|
May
(2) |
Jun
(12) |
Jul
(19) |
Aug
(8) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
(8) |
2006 |
Jan
(10) |
Feb
(1) |
Mar
(301) |
Apr
(232) |
May
(26) |
Jun
(20) |
Jul
(26) |
Aug
(79) |
Sep
(92) |
Oct
(174) |
Nov
(17) |
Dec
(93) |
2007 |
Jan
(27) |
Feb
(179) |
Mar
(37) |
Apr
(81) |
May
(20) |
Jun
(5) |
Jul
|
Aug
(40) |
Sep
(68) |
Oct
(8) |
Nov
(47) |
Dec
(34) |
2008 |
Jan
(154) |
Feb
(15) |
Mar
(5) |
Apr
(21) |
May
(4) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(8) |
Oct
(9) |
Nov
(35) |
Dec
(50) |
2009 |
Jan
(8) |
Feb
(10) |
Mar
(6) |
Apr
(9) |
May
(7) |
Jun
(40) |
Jul
(7) |
Aug
(5) |
Sep
(2) |
Oct
(16) |
Nov
(42) |
Dec
(5) |
2010 |
Jan
(3) |
Feb
(15) |
Mar
(32) |
Apr
(18) |
May
(6) |
Jun
(9) |
Jul
|
Aug
(11) |
Sep
(16) |
Oct
|
Nov
(4) |
Dec
(35) |
2011 |
Jan
(24) |
Feb
(6) |
Mar
(27) |
Apr
(119) |
May
(72) |
Jun
(20) |
Jul
(31) |
Aug
(88) |
Sep
(86) |
Oct
(14) |
Nov
(11) |
Dec
(30) |
2012 |
Jan
(4) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Jeff Du <jef...@ya...> - 2012-02-24 03:17:14
|
From: <gi...@gp...> - 2012-02-12 20:06:20
|
The branch, master has been updated via 82b497e0ab801cc08c19752af224a9c97f74110a (commit) from c6dd6949b59a41bf37b4cacbc4871397030b6fe2 (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/line.c | 57 +++++++++++++++++++++++++++------------------------------ 1 files changed, 27 insertions(+), 30 deletions(-) ================= Commit Messages ================= commit 82b497e0ab801cc08c19752af224a9c97f74110a Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> Fiddle with the 45-degre line snapping code The results should be identical, but hopefully this is clearer code. I believe there were some masked bugs lurking in the old calculations, which shouldn't be present in the new code. :100644 100644 8898238... 47e3125... M src/line.c ========= Changes ========= commit 82b497e0ab801cc08c19752af224a9c97f74110a Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> Fiddle with the 45-degre line snapping code The results should be identical, but hopefully this is clearer code. I believe there were some masked bugs lurking in the old calculations, which shouldn't be present in the new code. diff --git a/src/line.c b/src/line.c index 8898238..47e3125 100644 --- a/src/line.c +++ b/src/line.c @@ -82,16 +82,16 @@ AdjustAttachedLine (void) * * directions: * - * 0 - * 7 1 - * 6 2 - * 5 3 * 4 + * 5 3 + * 6 2 + * 7 1 + * 0 */ void FortyFiveLine (AttachedLineType *Line) { - Coord dx, dy, min; + Coord dx, dy, min, max; unsigned direction = 0; double m; @@ -99,22 +99,20 @@ FortyFiveLine (AttachedLineType *Line) dx = Crosshair.X - Line->Point1.X; dy = Crosshair.Y - Line->Point1.Y; - if (!dx) - { - if (!dy) - /* zero length line, don't draw anything */ - return; - else - direction = dy > 0 ? 0 : 4; - } + /* zero length line, don't draw anything */ + if (dx == 0 && dy == 0) + return; + + if (dx == 0) + direction = dy > 0 ? 0 : 4; else { - m = (double) dy / dx; + m = (double)dy / (double)dx; direction = 2; if (m > TAN_30_DEGREE) - direction = m > TAN_60_DEGREE ? 0 : 1; + direction = m > TAN_60_DEGREE ? 0 : 1; else if (m < -TAN_30_DEGREE) - direction = m < -TAN_60_DEGREE ? 0 : 3; + direction = m < -TAN_60_DEGREE ? 4 : 3; } if (dx < 0) direction += 4; @@ -122,19 +120,28 @@ FortyFiveLine (AttachedLineType *Line) dx = abs (dx); dy = abs (dy); min = MIN (dx, dy); + max = MAX (dx, dy); /* now set up the second pair of coordinates */ switch (direction) { case 0: + Line->Point2.X = Line->Point1.X; + Line->Point2.Y = Line->Point1.Y + max; + break; + case 4: Line->Point2.X = Line->Point1.X; - Line->Point2.Y = Crosshair.Y; + Line->Point2.Y = Line->Point1.Y - max; break; case 2: + Line->Point2.X = Line->Point1.X + max; + Line->Point2.Y = Line->Point1.Y; + break; + case 6: - Line->Point2.X = Crosshair.X; + Line->Point2.X = Line->Point1.X - max; Line->Point2.Y = Line->Point1.Y; break; @@ -500,24 +507,14 @@ EnforceLineDRC (void) if (XOR (r1 > r2, shift)) { if (PCB->Clipping) - { - if (shift) - PCB->Clipping = 2; - else - PCB->Clipping = 1; - } + PCB->Clipping = shift ? 2 : 1; Crosshair.X = rs.X; Crosshair.Y = rs.Y; } else { if (PCB->Clipping) - { - if (shift) - PCB->Clipping = 1; - else - PCB->Clipping = 2; - } + PCB->Clipping = shift ? 1 : 2; Crosshair.X = r45.X; Crosshair.Y = r45.Y; } |
From: <gi...@gp...> - 2012-02-12 19:55:04
|
The branch, master has been updated via c6dd6949b59a41bf37b4cacbc4871397030b6fe2 (commit) from b30e524e5ef574befa1fa538333aa739271b4e14 (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/hid/gtk/gtkhid-gl.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) ================= Commit Messages ================= commit c6dd6949b59a41bf37b4cacbc4871397030b6fe2 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> hid/gtk: Remove XOR colour logic from the GL rederer. This code was not being used, so remove it. :100644 100644 f3133ec... 45b9b72... M src/hid/gtk/gtkhid-gl.c ========= Changes ========= commit c6dd6949b59a41bf37b4cacbc4871397030b6fe2 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> hid/gtk: Remove XOR colour logic from the GL rederer. This code was not being used, so remove it. diff --git a/src/hid/gtk/gtkhid-gl.c b/src/hid/gtk/gtkhid-gl.c index f3133ec..45b9b72 100644 --- a/src/hid/gtk/gtkhid-gl.c +++ b/src/hid/gtk/gtkhid-gl.c @@ -68,7 +68,6 @@ typedef struct hid_gc_struct double alpha_mult; Coord width; gint cap, join; - gchar xor; } hid_gc_struct; @@ -356,8 +355,6 @@ typedef struct { int color_set; GdkColor color; - int xor_set; - GdkColor xor_color; double red; double green; double blue; @@ -420,20 +417,6 @@ set_gl_color_for_gc (hidGC gc) cc->blue = cc->color.blue / 65535.; cc->color_set = 1; } - if (gc->xor) - { - if (!cc->xor_set) - { - cc->xor_color.red = cc->color.red ^ gport->bg_color.red; - cc->xor_color.green = cc->color.green ^ gport->bg_color.green; - cc->xor_color.blue = cc->color.blue ^ gport->bg_color.blue; - gdk_color_alloc (gport->colormap, &cc->xor_color); - cc->red = cc->color.red / 65535.; - cc->green = cc->color.green / 65535.; - cc->blue = cc->color.blue / 65535.; - cc->xor_set = 1; - } - } r = cc->red; g = cc->green; b = cc->blue; |
From: <gi...@gp...> - 2012-01-22 13:32:43
|
The branch, master has been updated via b30e524e5ef574befa1fa538333aa739271b4e14 (commit) from 19353b04323b05598f6fac808a08c97771727395 (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/hid/common/draw_helpers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ================= Commit Messages ================= commit b30e524e5ef574befa1fa538333aa739271b4e14 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> hid/common/draw_helpers.c: Fix prototype to draw_octagon_poly() The thin_draw parameter is a bool, not a Coord. :100644 100644 03e82d8... 46d3822... M src/hid/common/draw_helpers.c ========= Changes ========= commit b30e524e5ef574befa1fa538333aa739271b4e14 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> hid/common/draw_helpers.c: Fix prototype to draw_octagon_poly() The thin_draw parameter is a bool, not a Coord. diff --git a/src/hid/common/draw_helpers.c b/src/hid/common/draw_helpers.c index 03e82d8..46d3822 100644 --- a/src/hid/common/draw_helpers.c +++ b/src/hid/common/draw_helpers.c @@ -321,7 +321,7 @@ FloatPolyType; static void draw_octagon_poly (hidGC gc, Coord X, Coord Y, - Coord Thickness, Coord thin_draw) + Coord Thickness, bool thin_draw) { static FloatPolyType p[8] = { { 0.5, -TAN_22_5_DEGREE_2}, |
From: <gi...@gp...> - 2012-01-14 17:04:04
|
The branch, master has been updated via 19353b04323b05598f6fac808a08c97771727395 (commit) from 409b2d1ec6acf418189ed16dfc1675b1079a1439 (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/move.c | 71 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 36 insertions(+), 35 deletions(-) ================= Commit Messages ================= commit 19353b04323b05598f6fac808a08c97771727395 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> move.c: Fix off-by one in memory copy loop. Shorten the loop so we don't don't try to memmove a zero length chunk off the end of our array. Might have been harmless, but lets not take the chance. Rename some variables to make things a bit clearer as well. (Caught by Coverity). Coverity-CID: 12 :100644 100644 8f7045d... d785823... M src/move.c ========= Changes ========= commit 19353b04323b05598f6fac808a08c97771727395 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> move.c: Fix off-by one in memory copy loop. Shorten the loop so we don't don't try to memmove a zero length chunk off the end of our array. Might have been harmless, but lets not take the chance. Rename some variables to make things a bit clearer as well. (Caught by Coverity). Coverity-CID: 12 diff --git a/src/move.c b/src/move.c index 8f7045d..d785823 100644 --- a/src/move.c +++ b/src/move.c @@ -932,7 +932,7 @@ LastLayerInSolderGroup (int layer) int MoveLayer (int old_index, int new_index) { - int groups[MAX_LAYER + 2], l, g; + int group_of_layer[MAX_LAYER + 2], l, g, i; LayerType saved_layer; int saved_group; @@ -968,12 +968,12 @@ MoveLayer (int old_index, int new_index) return 1; } - for (g = 0; g < MAX_LAYER+2; g++) - groups[g] = -1; + for (l = 0; l < MAX_LAYER+2; l++) + group_of_layer[l] = -1; for (g = 0; g < MAX_LAYER; g++) - for (l = 0; l < PCB->LayerGroups.Number[g]; l++) - groups[PCB->LayerGroups.Entries[g][l]] = g; + for (i = 0; i < PCB->LayerGroups.Number[g]; i++) + group_of_layer[PCB->LayerGroups.Entries[g][i]] = g; if (old_index == -1) { @@ -987,10 +987,10 @@ MoveLayer (int old_index, int new_index) lp = &PCB->Data->Layer[new_index]; memmove (&PCB->Data->Layer[new_index + 1], &PCB->Data->Layer[new_index], - (max_copper_layer - new_index + 2) * sizeof (LayerType)); - memmove (&groups[new_index + 1], - &groups[new_index], - (max_copper_layer - new_index + 2) * sizeof (int)); + (max_copper_layer + 2 - new_index) * sizeof (LayerType)); + memmove (&group_of_layer[new_index + 1], + &group_of_layer[new_index], + (max_copper_layer + 2 - new_index) * sizeof (int)); max_copper_layer++; memset (lp, 0, sizeof (LayerType)); lp->On = 1; @@ -1007,11 +1007,11 @@ MoveLayer (int old_index, int new_index) /* Delete the layer at old_index */ memmove (&PCB->Data->Layer[old_index], &PCB->Data->Layer[old_index + 1], - (max_copper_layer - old_index + 2 - 1) * sizeof (LayerType)); - memset (&PCB->Data->Layer[max_copper_layer + 1], 0, sizeof (LayerType)); - memmove (&groups[old_index], - &groups[old_index + 1], - (max_copper_layer - old_index + 2 - 1) * sizeof (int)); + (max_copper_layer + 2 - old_index - 1) * sizeof (LayerType)); + memset (&PCB->Data->Layer[max_copper_layer + 2 - 1], 0, sizeof (LayerType)); + memmove (&group_of_layer[old_index], + &group_of_layer[old_index + 1], + (max_copper_layer + 2 - old_index - 1) * sizeof (int)); for (l = 0; l < max_copper_layer; l++) if (LayerStack[l] == old_index) memmove (LayerStack + l, @@ -1026,14 +1026,14 @@ MoveLayer (int old_index, int new_index) { /* Move an existing layer */ memcpy (&saved_layer, &PCB->Data->Layer[old_index], sizeof (LayerType)); - saved_group = groups[old_index]; + saved_group = group_of_layer[old_index]; if (old_index < new_index) { memmove (&PCB->Data->Layer[old_index], &PCB->Data->Layer[old_index + 1], (new_index - old_index) * sizeof (LayerType)); - memmove (&groups[old_index], - &groups[old_index + 1], + memmove (&group_of_layer[old_index], + &group_of_layer[old_index + 1], (new_index - old_index) * sizeof (int)); } else @@ -1041,12 +1041,12 @@ MoveLayer (int old_index, int new_index) memmove (&PCB->Data->Layer[new_index + 1], &PCB->Data->Layer[new_index], (old_index - new_index) * sizeof (LayerType)); - memmove (&groups[new_index + 1], - &groups[new_index], + memmove (&group_of_layer[new_index + 1], + &group_of_layer[new_index], (old_index - new_index) * sizeof (int)); } memcpy (&PCB->Data->Layer[new_index], &saved_layer, sizeof (LayerType)); - groups[new_index] = saved_group; + group_of_layer[new_index] = saved_group; } move_all_thermals(old_index, new_index); @@ -1055,24 +1055,25 @@ MoveLayer (int old_index, int new_index) PCB->LayerGroups.Number[g] = 0; for (l = 0; l < max_copper_layer + 2; l++) { - int i; - g = groups[l]; - if (g >= 0) - { - i = PCB->LayerGroups.Number[g]++; - PCB->LayerGroups.Entries[g][i] = l; - } + g = group_of_layer[l]; + + /* XXX: Should this ever happen? */ + if (g < 0) + continue; + + i = PCB->LayerGroups.Number[g]++; + PCB->LayerGroups.Entries[g][i] = l; } - for (g = 0; g < MAX_LAYER; g++) - if (PCB->LayerGroups.Number[g] == 0) + for (g = 1; g < MAX_LAYER; g++) + if (PCB->LayerGroups.Number[g - 1] == 0) { - memmove (&PCB->LayerGroups.Number[g], - &PCB->LayerGroups.Number[g + 1], - (MAX_LAYER - g - 1) * sizeof (PCB->LayerGroups.Number[g])); - memmove (&PCB->LayerGroups.Entries[g], - &PCB->LayerGroups.Entries[g + 1], - (MAX_LAYER - g - 1) * sizeof (PCB->LayerGroups.Entries[g])); + memmove (&PCB->LayerGroups.Number[g - 1], + &PCB->LayerGroups.Number[g], + (MAX_LAYER - g) * sizeof (PCB->LayerGroups.Number[g])); + memmove (&PCB->LayerGroups.Entries[g - 1], + &PCB->LayerGroups.Entries[g], + (MAX_LAYER - g) * sizeof (PCB->LayerGroups.Entries[g])); } hid_action ("LayersChanged"); |
From: <gi...@gp...> - 2012-01-12 22:30:27
|
The branch, master has been updated via 409b2d1ec6acf418189ed16dfc1675b1079a1439 (commit) from 818ba7247eea5c2b137e55ed32011d11fb15cc7c (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/action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ================= Commit Messages ================= commit 409b2d1ec6acf418189ed16dfc1675b1079a1439 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> Set changed flag on PCB when locking / unlocking objects :100644 100644 affefba... 700bf29... M src/action.c ========= Changes ========= commit 409b2d1ec6acf418189ed16dfc1675b1079a1439 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> Set changed flag on PCB when locking / unlocking objects diff --git a/src/action.c b/src/action.c index affefba..700bf29 100644 --- a/src/action.c +++ b/src/action.c @@ -1150,6 +1150,7 @@ NotifyMode (void) */ DrawElement (element); Draw (); + SetChangedFlag (true); hid_actionl ("Report", "Object", NULL); } else if (type != NO_TYPE) @@ -1164,6 +1165,7 @@ NotifyMode (void) DrawObject (type, ptr1, ptr2); Draw (); } + SetChangedFlag (true); hid_actionl ("Report", "Object", NULL); } break; |
From: <gi...@gp...> - 2012-01-03 23:42:00
|
The branch, master has been updated via 818ba7247eea5c2b137e55ed32011d11fb15cc7c (commit) from 6eef4d15a766c0c86c12a6980be27342df96ac6a (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 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) ================= Commit Messages ================= commit 818ba7247eea5c2b137e55ed32011d11fb15cc7c Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> Update the crosshair constraints after mirroring or rotating the buffer. Avoids a bug where the paste location of the mirrored or rotated buffer contents are improperly constrained based upon their old bounding box. :100644 100644 0394f2f... d311420... M src/buffer.c ========= Changes ========= commit 818ba7247eea5c2b137e55ed32011d11fb15cc7c Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> Update the crosshair constraints after mirroring or rotating the buffer. Avoids a bug where the paste location of the mirrored or rotated buffer contents are improperly constrained based upon their old bounding box. diff --git a/src/buffer.c b/src/buffer.c index 0394f2f..d311420 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1226,6 +1226,7 @@ RotateBuffer (BufferType *Buffer, BYTE Number) /* finally the origin and the bounding box */ ROTATE (Buffer->X, Buffer->Y, Buffer->X, Buffer->Y, Number); RotateBoxLowLevel (&Buffer->BoundingBox, Buffer->X, Buffer->Y, Number); + SetCrosshairRangeToBuffer (); } static void @@ -1360,6 +1361,7 @@ FreeRotateBuffer (BufferType *Buffer, Angle angle) ENDALL_LOOP; SetBufferBoundingBox (Buffer); + SetCrosshairRangeToBuffer (); } @@ -1475,6 +1477,7 @@ MirrorBuffer (BufferType *Buffer) } ENDALL_LOOP; SetBufferBoundingBox (Buffer); + SetCrosshairRangeToBuffer (); } @@ -1601,6 +1604,7 @@ SwapBuffer (BufferType *Buffer) } } SetBufferBoundingBox (Buffer); + SetCrosshairRangeToBuffer (); } /* ---------------------------------------------------------------------- |
From: <gi...@gp...> - 2011-12-26 16:28:21
|
The branch, master has been updated via 6eef4d15a766c0c86c12a6980be27342df96ac6a (commit) from 5b05cd2d9e006f062708c38b95444fda3f4cc5f5 (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/djopt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ================= Commit Messages ================= commit 6eef4d15a766c0c86c12a6980be27342df96ac6a Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> djopt.c: Fix incorrect allocation. I missed this fix from the commit ff2492399fd4743c3fd89ffd4fe6650ad0d80a4a (Caught by coverity) Coverity-cid: 239 :100644 100644 8a51d0e... eae52c6... M src/djopt.c ========= Changes ========= commit 6eef4d15a766c0c86c12a6980be27342df96ac6a Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> djopt.c: Fix incorrect allocation. I missed this fix from the commit ff2492399fd4743c3fd89ffd4fe6650ad0d80a4a (Caught by coverity) Coverity-cid: 239 diff --git a/src/djopt.c b/src/djopt.c index 8a51d0e..eae52c6 100644 --- a/src/djopt.c +++ b/src/djopt.c @@ -1297,7 +1297,7 @@ orthopull_1 (corner_s * c, int fdir, int rdir, int any_sel) if (cn >= cm) { cm = cn + 10; - cs = (corner_s **) realloc (cs, cm * sizeof (corner_s)); + cs = (corner_s **) realloc (cs, cm * sizeof (corner_s *)); } cs[cn++] = c2; r2 = corner_radius (c2); |
From: <gi...@gp...> - 2011-12-25 01:19:19
|
The branch, master has been updated via 5b05cd2d9e006f062708c38b95444fda3f4cc5f5 (commit) from 3090f8155021b0191d408bfacaeaf62abf19bd98 (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 ========= gts/matrix.c | 9 ++++++--- gts/refine.c | 11 ++++++++--- gts/split.c | 13 ++++++++----- gts/vopt.c | 3 ++- 4 files changed, 24 insertions(+), 12 deletions(-) ================= Commit Messages ================= commit 5b05cd2d9e006f062708c38b95444fda3f4cc5f5 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> gts: Avoid performing computations with side-effects in g_assert statements g_assert (like assert), can be disabled at build time, so assertions should therefore not contain any expressions which have side-effects. Coverity caught a number of these in the copy gts library we have embedded. There were also a couple which coverity didn't complain about, which appear to be the same class of problem. Fix them by separating the computation and the assertion test, adding a temporary result variable as necessary. Coverity-cid: 56 Coverity-cid: 57 Coverity-cid: 57 Coverity-cid: 58 Coverity-cid: 59 :100644 100644 7ada15d... eb0b1f8... M gts/matrix.c :100644 100644 293eb11... eab585d... M gts/refine.c :100644 100644 43fea3a... b7bee77... M gts/split.c :100644 100644 d772af9... 4bc448e... M gts/vopt.c ========= Changes ========= commit 5b05cd2d9e006f062708c38b95444fda3f4cc5f5 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> gts: Avoid performing computations with side-effects in g_assert statements g_assert (like assert), can be disabled at build time, so assertions should therefore not contain any expressions which have side-effects. Coverity caught a number of these in the copy gts library we have embedded. There were also a couple which coverity didn't complain about, which appear to be the same class of problem. Fix them by separating the computation and the assertion test, adding a temporary result variable as necessary. Coverity-cid: 56 Coverity-cid: 57 Coverity-cid: 57 Coverity-cid: 58 Coverity-cid: 59 diff --git a/gts/matrix.c b/gts/matrix.c index 7ada15d..eb0b1f8 100644 --- a/gts/matrix.c +++ b/gts/matrix.c @@ -126,11 +126,14 @@ GtsMatrix * gts_matrix_projection (GtsTriangle * t) x3 = y1*z2 - z1*y2; y3 = z1*x2 - x1*z2; z3 = x1*y2 - y1*x2; x2 = y3*z1 - z3*y1; y2 = z3*x1 - x3*z1; z2 = x3*y1 - y3*x1; - g_assert ((l = sqrt (x1*x1 + y1*y1 + z1*z1)) > 0.0); + l = sqrt (x1*x1 + y1*y1 + z1*z1); + g_assert (l > 0.0); m[0][0] = x1/l; m[1][0] = y1/l; m[2][0] = z1/l; m[3][0] = 0.; - g_assert ((l = sqrt (x2*x2 + y2*y2 + z2*z2)) > 0.0); + l = sqrt (x2*x2 + y2*y2 + z2*z2); + g_assert (l > 0.0); m[0][1] = x2/l; m[1][1] = y2/l; m[2][1] = z2/l; m[3][1] = 0.; - g_assert ((l = sqrt (x3*x3 + y3*y3 + z3*z3)) > 0.0); + l = sqrt (x3*x3 + y3*y3 + z3*z3); + g_assert (l > 0.0); m[0][2] = x3/l; m[1][2] = y3/l; m[2][2] = z3/l; m[3][2] = 0.; m[0][3] = 0; m[1][3] = 0.; m[2][3] = 0.; m[3][3] = 1.; diff --git a/gts/refine.c b/gts/refine.c index 293eb11..eab585d 100644 --- a/gts/refine.c +++ b/gts/refine.c @@ -191,6 +191,7 @@ static gint split_encroached (GtsSurface * surface, GtsSegment * s; while (steiner_max-- != 0 && (s = gts_fifo_pop (encroached))) { + GtsVertex *add_vertex_returned; GtsVertex * v = split_edge (GTS_EDGE (s), surface); GtsFace * boundary = gts_edge_is_boundary (GTS_EDGE (s), surface); GtsFace * f = boundary; @@ -217,8 +218,10 @@ static gint split_encroached (GtsSurface * surface, GTS_OBJECT (s)->klass = GTS_OBJECT_CLASS (surface->edge_class); if (f == NULL) - g_assert ((f = gts_edge_has_parent_surface (GTS_EDGE (s), surface))); - g_assert (gts_delaunay_add_vertex_to_face (surface, v, f) == NULL); + f = gts_edge_has_parent_surface (GTS_EDGE (s), surface); + g_assert (f != NULL); + add_vertex_returned = gts_delaunay_add_vertex_to_face (surface, v, f); + g_assert (add_vertex_returned == NULL); if (boundary) gts_object_destroy (GTS_OBJECT (s)); @@ -385,12 +388,14 @@ guint gts_delaunay_refine (GtsSurface * surface, GTS_OBJECT (surface)->reserved = heap; while (steiner_max-- != 0 && (f = gts_eheap_remove_top (heap, NULL))) { + GtsVertex *add_vertex_returned; GtsVertex * c = GTS_VERTEX (gts_triangle_circumcircle_center (GTS_TRIANGLE (f), GTS_POINT_CLASS (surface->vertex_class))); EHEAP_PAIR (f) = NULL; g_assert (c != NULL); - g_assert (gts_delaunay_add_vertex (surface, c, f) == NULL); + add_vertex_returned = gts_delaunay_add_vertex (surface, c, f); + g_assert (add_vertex_returned == NULL); vertex_encroaches (c, surface, encroached, encroaches, encroach_data); if (!gts_fifo_is_empty (encroached)) { diff --git a/gts/split.c b/gts/split.c index 43fea3a..b7bee77 100644 --- a/gts/split.c +++ b/gts/split.c @@ -253,9 +253,10 @@ static CFace * cface_new (GtsFace * f, v = GTS_SEGMENT (e1)->v1 == v1 ? GTS_SEGMENT (e1)->v2 : GTS_SEGMENT (e1)->v1; #ifdef NEW - if ((cf->flags & CFACE_E1) || (cf->flags & CFACE_E2)) - g_assert ((vvs = GTS_EDGE (gts_vertices_are_connected (vs->v, v)))); - else + if ((cf->flags & CFACE_E1) || (cf->flags & CFACE_E2)) { + vvs = GTS_EDGE (gts_vertices_are_connected (vs->v, v)); + g_assert (vvs != NULL); + } else #endif vvs = gts_edge_new (klass, v, vs->v); @@ -591,7 +592,8 @@ void gts_split_collapse (GtsSplit * vs, v1 = GTS_SPLIT_V1 (vs); v2 = GTS_SPLIT_V2 (vs); - g_assert ((e = GTS_EDGE (gts_vertices_are_connected (v1, v2)))); + e = GTS_EDGE (gts_vertices_are_connected (v1, v2)); + g_assert (e != NULL); #ifdef DEBUG fprintf (stderr, "collapsing %p: v1: %p v2: %p v: %p\n", vs, v1, v2, v); @@ -945,7 +947,8 @@ GtsSplit * gts_split_new (GtsSplitClass * klass, #else v1 = GTS_SPLIT_V1 (vs); v2 = GTS_SPLIT_V2 (vs); - g_assert ((e = GTS_EDGE (gts_vertices_are_connected (v1, v2)))); + e = GTS_EDGE (gts_vertices_are_connected (v1, v2)); + g_assert (e != NULL); i = e->triangles; vs->ncf = g_slist_length (i); g_assert (vs->ncf > 0); diff --git a/gts/vopt.c b/gts/vopt.c index d772af9..4bc448e 100644 --- a/gts/vopt.c +++ b/gts/vopt.c @@ -475,7 +475,8 @@ GtsVertex * gts_volume_optimized_vertex (GtsEdge * edge, #endif /* Weighted average of volume, boundary and shape optimization */ g_assert (n == 3); - g_assert ((Ai = gts_matrix3_inverse (A))); + Ai = gts_matrix3_inverse (A); + g_assert (Ai != NULL); v = gts_vertex_new (klass, Ai[0][0]*b[0] + Ai[0][1]*b[1] + Ai[0][2]*b[2], |
From: <gi...@gp...> - 2011-12-25 00:48:19
|
The branch, master has been updated via 3090f8155021b0191d408bfacaeaf62abf19bd98 (commit) from 0f9a4b4d102619bf871f9fb79e3221cf2f220808 (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/hid/gtk/gui-netlist-window.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) ================= Commit Messages ================= commit 3090f8155021b0191d408bfacaeaf62abf19bd98 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> hid/gtk: Avoid warnings when netlist window is not created. 1. When the NetlistChanged action is fired, we should only update if the netlist window is visible. (It will be created up to date when the user asks for it). 2. Always show the netlist window when requested, even if it has no entries. This is good for consistent UI behaviour anyway, as the user should be shown a blank netlist window if they request it.. even if the is no content to display. :100644 100644 249066f... e2c08d5... M src/hid/gtk/gui-netlist-window.c ========= Changes ========= commit 3090f8155021b0191d408bfacaeaf62abf19bd98 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> hid/gtk: Avoid warnings when netlist window is not created. 1. When the NetlistChanged action is fired, we should only update if the netlist window is visible. (It will be created up to date when the user asks for it). 2. Always show the netlist window when requested, even if it has no entries. This is good for consistent UI behaviour anyway, as the user should be shown a blank netlist window if they request it.. even if the is no content to display. diff --git a/src/hid/gtk/gui-netlist-window.c b/src/hid/gtk/gui-netlist-window.c index 249066f..e2c08d5 100644 --- a/src/hid/gtk/gui-netlist-window.c +++ b/src/hid/gtk/gui-netlist-window.c @@ -699,11 +699,6 @@ ghid_netlist_window_create (GHidPort * out) GtkCellRenderer *renderer; GtkTreeViewColumn *column; - /* No point in putting up the window if no netlist is loaded. - */ - if (!PCB->NetlistLib.MenuN) - return; - if (netlist_window) return; @@ -1014,6 +1009,10 @@ GhidNetlistChanged (int argc, char **argv, Coord x, Coord y) if (ghidgui == NULL || !ghidgui->is_up) return 0; + /* There is no need to update if the netlist window isn't open */ + if (netlist_window == NULL) + return 0; + loading_new_netlist = TRUE; ghid_netlist_window_update (TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (disable_all_button), |
From: <gi...@gp...> - 2011-12-24 23:12:55
|
The branch, master has been updated via 0f9a4b4d102619bf871f9fb79e3221cf2f220808 (commit) from 2b66cd7a7eec8b1d9394eb7e5feda0be3c7d47d3 (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/hid/gtk/ghid-cell-renderer-visibility.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) ================= Commit Messages ================= commit 0f9a4b4d102619bf871f9fb79e3221cf2f220808 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> hid/gtk: Add subtle gradient effect to layer selector swatches Just because gradients are pretty ;) :100644 100644 6e69744... 063d434... M src/hid/gtk/ghid-cell-renderer-visibility.c ========= Changes ========= commit 0f9a4b4d102619bf871f9fb79e3221cf2f220808 Author: Peter Clifton <pe...@cl...> Commit: Peter Clifton <pe...@cl...> hid/gtk: Add subtle gradient effect to layer selector swatches Just because gradients are pretty ;) diff --git a/src/hid/gtk/ghid-cell-renderer-visibility.c b/src/hid/gtk/ghid-cell-renderer-visibility.c index 6e69744..063d434 100644 --- a/src/hid/gtk/ghid-cell-renderer-visibility.c +++ b/src/hid/gtk/ghid-cell-renderer-visibility.c @@ -116,6 +116,8 @@ ghid_cell_renderer_visibility_render (GtkCellRenderer *cell, { GdkColor color; cairo_t *cr = gdk_cairo_create (window); + cairo_pattern_t *pattern; + if (expose_area) { gdk_cairo_rectangle (cr, expose_area); @@ -137,7 +139,25 @@ ghid_cell_renderer_visibility_render (GtkCellRenderer *cell, color.green = (4*color.green + 65535) / 5; color.blue = (4*color.blue + 65535) / 5; } - gdk_cairo_set_source_color (cr, &color); + + pattern = cairo_pattern_create_radial ((toggle_rect.width - 1.) * 0.75 + toggle_rect.x + 0.5, + (toggle_rect.height - 1.) * 0.75 + toggle_rect.y + 0.5, + 0., + (toggle_rect.width - 1.) * 0.50 + toggle_rect.x + 0.5, + (toggle_rect.height - 1.) * 0.50 + toggle_rect.y + 0.5, + (toggle_rect.width - 1.) * 0.71); + + cairo_pattern_add_color_stop_rgb (pattern, 0.0, + (color.red / 65535. * 4. + 1.) / 5., + (color.green / 65535. * 4. + 1.) / 5., + (color.blue / 65535. * 4. + 1.) / 5.); + cairo_pattern_add_color_stop_rgb (pattern, 1.0, + (color.red / 65535. * 5. + 0.) / 5., + (color.green / 65535. * 5. + 0.) / 5., + (color.blue / 65535. * 5. + 0.) / 5.); + cairo_set_source (cr, pattern); + cairo_pattern_destroy (pattern); + if (pcb_cell->active) cairo_rectangle (cr, toggle_rect.x + 0.5, toggle_rect.y + 0.5, toggle_rect.width - 1, toggle_rect.height - 1); |
From: <gi...@gp...> - 2011-12-24 18:19:33
|
The branch, master has been updated via 2b66cd7a7eec8b1d9394eb7e5feda0be3c7d47d3 (commit) via c1536167c44f4424ce40d394fcfd260431173f58 (commit) from 356d1e05840111c190490f2e6b2e5987a2d2364c (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/hid/gtk/gtkhid-main.c | 10 ++++------ src/hid/gtk/gui-netlist-window.c | 5 +++++ src/hid/gtk/gui.h | 2 ++ 3 files changed, 11 insertions(+), 6 deletions(-) ================= Commit Messages ================= commit 2b66cd7a7eec8b1d9394eb7e5feda0be3c7d47d3 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk: Fix NetlistChanged action crash when exporting from the commandline. I broke this in commit 7308f512307158944482227d58e66373fd023d62 when I added a missing notification to the GUI when free'ing the netlist. It turns out that a command-line invoked export (such as used to export images in the doc/ build) will hit this code-path, and provoke the GUI netlist window code to try and update before the GUI is actually loaded. For now, lets fix this with a bandaid and just skip the netlist update if the GUI is not up. A brief inspection of the code (and test for the doc/ build) suggests that the Lesstif HID is not affected by this problem. (It has similar code to avoid creating the netlist window if the main window is not already created). :100644 100644 447b10e... 249066f... M src/hid/gtk/gui-netlist-window.c commit c1536167c44f4424ce40d394fcfd260431173f58 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk: Move ghid_gui_is_up variable into the ghidgui structure. This lets us access it outside of gtkhid-main.c :100644 100644 db7d831... eb0ad14... M src/hid/gtk/gtkhid-main.c :100644 100644 e4d55dd... 34b4c11... M src/hid/gtk/gui.h ========= Changes ========= commit 2b66cd7a7eec8b1d9394eb7e5feda0be3c7d47d3 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk: Fix NetlistChanged action crash when exporting from the commandline. I broke this in commit 7308f512307158944482227d58e66373fd023d62 when I added a missing notification to the GUI when free'ing the netlist. It turns out that a command-line invoked export (such as used to export images in the doc/ build) will hit this code-path, and provoke the GUI netlist window code to try and update before the GUI is actually loaded. For now, lets fix this with a bandaid and just skip the netlist update if the GUI is not up. A brief inspection of the code (and test for the doc/ build) suggests that the Lesstif HID is not affected by this problem. (It has similar code to avoid creating the netlist window if the main window is not already created). diff --git a/src/hid/gtk/gui-netlist-window.c b/src/hid/gtk/gui-netlist-window.c index 447b10e..249066f 100644 --- a/src/hid/gtk/gui-netlist-window.c +++ b/src/hid/gtk/gui-netlist-window.c @@ -1009,6 +1009,11 @@ ghid_netlist_window_update (gboolean init_nodes) static gint GhidNetlistChanged (int argc, char **argv, Coord x, Coord y) { + /* XXX: We get called before the GUI is up when + * exporting from the command-line. */ + if (ghidgui == NULL || !ghidgui->is_up) + return 0; + loading_new_netlist = TRUE; ghid_netlist_window_update (TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (disable_all_button), commit c1536167c44f4424ce40d394fcfd260431173f58 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk: Move ghid_gui_is_up variable into the ghidgui structure. This lets us access it outside of gtkhid-main.c diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c index db7d831..eb0ad14 100644 --- a/src/hid/gtk/gtkhid-main.c +++ b/src/hid/gtk/gtkhid-main.c @@ -239,12 +239,10 @@ ghid_calibrate (double xval, double yval) printf (_("ghid_calibrate() -- not implemented\n")); } -static int ghid_gui_is_up = 0; - void ghid_notify_gui_is_up () { - ghid_gui_is_up = 1; + ghidgui->is_up = 1; } int @@ -253,7 +251,7 @@ ghid_shift_is_pressed () GdkModifierType mask; GHidPort *out = &ghid_port; - if( ! ghid_gui_is_up ) + if (!ghidgui->is_up) return 0; gdk_window_get_pointer (gtk_widget_get_window (out->drawing_area), @@ -267,7 +265,7 @@ ghid_control_is_pressed () GdkModifierType mask; GHidPort *out = &ghid_port; - if( ! ghid_gui_is_up ) + if (!ghidgui->is_up) return 0; gdk_window_get_pointer (gtk_widget_get_window (out->drawing_area), @@ -281,7 +279,7 @@ ghid_mod1_is_pressed () GdkModifierType mask; GHidPort *out = &ghid_port; - if( ! ghid_gui_is_up ) + if (!ghidgui->is_up) return 0; gdk_window_get_pointer (gtk_widget_get_window (out->drawing_area), diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h index e4d55dd..34b4c11 100644 --- a/src/hid/gtk/gui.h +++ b/src/hid/gtk/gui.h @@ -146,6 +146,8 @@ typedef struct library_window_width, library_window_height, netlist_window_height, history_size, settings_mode; + + bool is_up; } GhidGui; |
From: <gi...@gp...> - 2011-12-24 15:41:58
|
The branch, master has been updated via 356d1e05840111c190490f2e6b2e5987a2d2364c (commit) via 9f239a9c2e0a16c15070d90cb128d3688da0ebac (commit) from 8e70de4d87dd2bf1979ddf17ce235bb0e2f7d113 (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/action.c | 178 ++++++++++++------------ src/autoplace.c | 56 ++++---- src/autoroute.c | 40 +++--- src/buffer.c | 112 +++++++------- src/buffer.h | 22 ++-- src/change.c | 270 +++++++++++++++++----------------- src/change.h | 10 +- src/copy.c | 52 ++++---- src/copy.h | 6 +- src/create.c | 154 ++++++++++---------- src/create.h | 71 ++++------ src/crosshair.c | 64 ++++---- src/data.c | 2 +- src/data.h | 2 +- src/djopt.c | 6 +- src/draw.c | 152 ++++++++++---------- src/draw.h | 62 ++++---- src/drill.c | 40 +++--- src/drill.h | 6 +- src/edif.y | 8 +- src/file.c | 52 ++++---- src/find.c | 293 +++++++++++++++++++------------------- src/find.h | 22 ++-- src/fontmode.c | 8 +- src/global.h | 151 ++++++++++---------- src/hid/gerber/gerber.c | 2 +- src/hid/gtk/gtkhid-gl.c | 2 +- src/hid/gtk/gtkhid-main.c | 2 +- src/hid/gtk/gui-drc-window.c | 2 +- src/hid/gtk/gui-netlist-window.c | 4 +- src/hid/gtk/gui-output-events.c | 4 +- src/hid/gtk/gui.h | 6 +- src/hid/lesstif/netlist.c | 20 ++-- src/hid/nelma/nelma.c | 14 +- src/hid/ps/ps.c | 4 +- src/insert.c | 26 ++-- src/insert.h | 2 +- src/intersect.c | 22 ++-- src/intersect.h | 4 +- src/line.c | 20 ++-- src/line.h | 2 +- src/macro.h | 56 ++++---- src/mirror.c | 2 +- src/mirror.h | 2 +- src/misc.c | 98 +++++++------- src/misc.h | 46 +++--- src/move.c | 84 ++++++------ src/move.h | 8 +- src/mtspace.c | 4 +- src/mymem.c | 126 ++++++++-------- src/mymem.h | 72 +++++----- src/netlist.c | 4 +- src/parse_l.h | 8 +- src/parse_l.l | 20 ++- src/parse_y.y | 30 ++-- src/polygon.c | 116 ++++++++-------- src/polygon.h | 24 ++-- src/polygon1.c | 8 +- src/print.c | 14 +- src/puller.c | 96 ++++++------ src/rats.c | 124 ++++++++-------- src/rats.h | 12 +- src/remove.c | 88 ++++++------ src/remove.h | 14 +- src/report.c | 68 +++++----- src/rotate.c | 58 ++++---- src/rotate.h | 14 +- src/rubberband.c | 102 +++++++------- src/search.c | 258 +++++++++++++++++----------------- src/search.h | 24 ++-- src/select.c | 74 +++++----- src/select.h | 6 +- src/thermal.c | 8 +- src/thermal.h | 2 +- src/toporouter.c | 8 +- src/undo.c | 263 ++++++++++++++++------------------ src/undo.h | 2 +- src/vendor.c | 2 +- src/vendor.h | 2 +- 79 files changed, 1948 insertions(+), 1974 deletions(-) ================= Commit Messages ================= commit 356d1e05840111c190490f2e6b2e5987a2d2364c Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove *TypePtr and *TypeHandle aliases now we no longer use them (May break build of plugins, hence keeping this as a separately revertable commit). :100644 100644 4b21931... 7b28396... M src/global.h :100644 100644 71c0a84... 46061a3... M src/mymem.h commit 9f239a9c2e0a16c15070d90cb128d3688da0ebac Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove usage of *TypePtr and *TypeHandle type aliases Coverity already caught several bugs where we mixed up the various FooType FooTypePtr and FooTypeHandle types when passing to sizeof(). Personally I find it much easier to follow FooType * and FooType **, so drop the aliases and hopefully keep things earier to follow. :100644 100644 b1c33ab... affefba... M src/action.c :100644 100644 e7cdee8... 21ab5f2... M src/autoplace.c :100644 100644 374b6ac... 8081262... M src/autoroute.c :100644 100644 1f9293a... 0394f2f... M src/buffer.c :100644 100644 6871216... 6a264ea... M src/buffer.h :100644 100644 aaad7a2... f7d571c... M src/change.c :100644 100644 3fd896d... f42842a... M src/change.h :100644 100644 193bb52... 9d92ced... M src/copy.c :100644 100644 af0b7ff... e9871fc... M src/copy.h :100644 100644 8a1effd... 9ed7caa... M src/create.c :100644 100644 faebe52... 4872514... M src/create.h :100644 100644 055f390... f0526b8... M src/crosshair.c :100644 100644 702d9ca... 9d6588c... M src/data.c :100644 100644 efb2ed1... 28cbfda... M src/data.h :100644 100644 a377508... 8a51d0e... M src/djopt.c :100644 100644 a11c6e2... ae1e99a... M src/draw.c :100644 100644 cc0822f... c7ffa97... M src/draw.h :100644 100644 efa9baa... 7830e49... M src/drill.c :100644 100644 f155a72... e9c4e92... M src/drill.h :100644 100644 cb31d9a... e5a606d... M src/edif.y :100644 100644 c157659... 1f5c406... M src/file.c :100644 100644 fa03ba7... d854b0b... M src/find.c :100644 100644 1d54111... 6ccc81f... M src/find.h :100644 100644 f218e7c... e09f825... M src/fontmode.c :100644 100644 79c1456... 4b21931... M src/global.h :100644 100644 dd9c1c9... 2181718... M src/hid/gerber/gerber.c :100644 100644 7471afc... f3133ec... M src/hid/gtk/gtkhid-gl.c :100644 100644 d8bf02c... db7d831... M src/hid/gtk/gtkhid-main.c :100644 100644 9cbc955... 1613923... M src/hid/gtk/gui-drc-window.c :100644 100644 51192c6... 447b10e... M src/hid/gtk/gui-netlist-window.c :100644 100644 20e8e03... 2ca39de... M src/hid/gtk/gui-output-events.c :100644 100644 788553e... e4d55dd... M src/hid/gtk/gui.h :100644 100644 572fba1... ba2cd4b... M src/hid/lesstif/netlist.c :100644 100644 fd0aa11... 048f476... M src/hid/nelma/nelma.c :100644 100644 263a240... ebab761... M src/hid/ps/ps.c :100644 100644 7e12874... a254998... M src/insert.c :100644 100644 2793edf... 31fc6dc... M src/insert.h :100644 100644 33b359d... 59aa064... M src/intersect.c :100644 100644 7ed758e... f3e3205... M src/intersect.h :100644 100644 6846b2d... 8898238... M src/line.c :100644 100644 8a5e4d2... 8552cae... M src/line.h :100644 100644 59c53ba... 715f0c9... M src/macro.h :100644 100644 54c53cb... 1adeda9... M src/mirror.c :100644 100644 50f648a... 97ea0bb... M src/mirror.h :100644 100644 13ce8f6... f675079... M src/misc.c :100644 100644 2f34cfe... 9ce0905... M src/misc.h :100644 100644 f1971d5... 8f7045d... M src/move.c :100644 100644 801a5cc... f91602e... M src/move.h :100644 100644 8bb3a8c... 3eba55a... M src/mtspace.c :100644 100644 c79e068... 3de31f6... M src/mymem.c :100644 100644 88c5628... 71c0a84... M src/mymem.h :100644 100644 f467f52... d47f7d2... M src/netlist.c :100644 100644 dfeed70... d11b0c8... M src/parse_l.h :100644 100644 c0ec6a7... 882fd2c... M src/parse_l.l :100644 100644 adc2387... 2ae9f6c... M src/parse_y.y :100644 100644 1114e33... 2d3e9e4... M src/polygon.c :100644 100644 e5d1ace... c217653... M src/polygon.h :100644 100644 9da353e... 667e26d... M src/polygon1.c :100644 100644 6d984a6... 972d13e... M src/print.c :100644 100644 90f082a... 7c9f0f9... M src/puller.c :100644 100644 fc6948f... e7221fa... M src/rats.c :100644 100644 16e5338... dc7479b... M src/rats.h :100644 100644 d38805f... 39af48f... M src/remove.c :100644 100644 9066428... f1f4596... M src/remove.h :100644 100644 d461bd2... 64db36a... M src/report.c :100644 100644 99f379d... fb23ba1... M src/rotate.c :100644 100644 2ac060e... 85a9361... M src/rotate.h :100644 100644 f5f7442... cd2c4f6... M src/rubberband.c :100644 100644 29271f0... 5f4ea5e... M src/search.c :100644 100644 30553dd... bdf460e... M src/search.h :100644 100644 31ea28d... 4cdc008... M src/select.c :100644 100644 6d91278... 3e0369f... M src/select.h :100644 100644 d2cfa95... 2f91d7d... M src/thermal.c :100644 100644 b252f4f... c476420... M src/thermal.h :100644 100644 d31c788... 0a83569... M src/toporouter.c :100644 100644 c3fc57e... ca41c74... M src/undo.c :100644 100644 2ec6442... f415c3c... M src/undo.h :100644 100644 f7b89f7... fbed9f0... M src/vendor.c :100644 100644 9706448... 26e3dc5... M src/vendor.h ========= Changes ========= commit 356d1e05840111c190490f2e6b2e5987a2d2364c Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove *TypePtr and *TypeHandle aliases now we no longer use them (May break build of plugins, hence keeping this as a separately revertable commit). diff --git a/src/global.h b/src/global.h index 4b21931..7b28396 100644 --- a/src/global.h +++ b/src/global.h @@ -118,7 +118,7 @@ typedef struct { unsigned long f; /* generic flags */ unsigned char t[(MAX_LAYER + 1) / 2]; /* thermals */ -} FlagType, *FlagTypePtr; +} FlagType; #ifndef __GNUC__ #define __FUNCTION1(a,b) a ":" #b @@ -190,7 +190,7 @@ typedef struct /* holds information about output window */ fgGC, /* changed from some routines */ pmGC; /* depth 1 pixmap GC to store clip */ } -OutputType, *OutputTypePtr; +OutputType; /* ---------------------------------------------------------------------- * layer group. A layer group identifies layers which are always switched @@ -200,7 +200,7 @@ typedef struct { Cardinal Number[MAX_LAYER], /* number of entries per groups */ Entries[MAX_LAYER][MAX_LAYER + 2]; -} LayerGroupType, *LayerGroupTypePtr; +} LayerGroupType; struct BoxType /* a bounding box */ { @@ -212,13 +212,13 @@ typedef struct { Coord x, y; Coord width, height; -} RectangleType, *RectangleTypePtr; +} RectangleType; typedef struct { char *name; char *value; -} AttributeType, *AttributeTypePtr; +} AttributeType; struct AttributeListType { @@ -234,24 +234,24 @@ struct AttributeListType based on this. */ typedef struct { ANYOBJECTFIELDS; -} AnyObjectType, *AnyObjectTypePtr; +} AnyObjectType; typedef struct /* a line/polygon point */ { Coord X, Y, X2, Y2; /* so Point type can be cast as BoxType */ long int ID; -} PointType, *PointTypePtr; +} PointType; /* Lines, rats, pads, etc. */ typedef struct { ANYLINEFIELDS; -} AnyLineObjectType, *AnyLineObjectTypePtr; +} AnyLineObjectType; typedef struct /* holds information about one line */ { ANYLINEFIELDS; char *Number; -} LineType, *LineTypePtr; +} LineType; typedef struct { @@ -261,7 +261,7 @@ typedef struct BYTE Direction; char *TextString; /* string */ void *Element; -} TextType, *TextTypePtr; +} TextType; struct polygon_st /* holds information about a polygon */ { @@ -287,7 +287,7 @@ typedef struct /* holds information about arcs */ Coord Width, Height, /* length of axis */ X, Y; /* center coordinates */ Angle StartAngle, Delta; /* the two limiting angles in degrees */ -} ArcType, *ArcTypePtr; +} ArcType; struct rtree { @@ -313,13 +313,13 @@ typedef struct /* holds information about one layer */ AttributeListType Attributes; int no_drc; /* whether to ignore the layer when checking the design rules */ } -LayerType, *LayerTypePtr; +LayerType; typedef struct /* a rat-line */ { ANYLINEFIELDS; Cardinal group1, group2; /* the layer group each point is on */ -} RatType, *RatTypePtr; +} RatType; struct pad_st /* a SMD pad */ { @@ -365,7 +365,7 @@ typedef struct GList *Arc; BoxType VBox; AttributeListType Attributes; -} ElementType, *ElementTypePtr, **ElementTypeHandle; +} ElementType; /* --------------------------------------------------------------------------- * symbol and font related stuff @@ -378,7 +378,7 @@ typedef struct /* a single symbol */ LineMax; Coord Width, Height, /* size of cell */ Delta; /* distance to next symbol */ -} SymbolType, *SymbolTypePtr; +} SymbolType; typedef struct /* complete set of symbols */ { @@ -387,7 +387,7 @@ typedef struct /* complete set of symbols */ BoxType DefaultSymbol; /* the default symbol is a filled box */ SymbolType Symbol[MAX_FONTPOSITION + 1]; bool Valid; -} FontType, *FontTypePtr; +} FontType; typedef struct /* holds all objects */ { @@ -403,7 +403,7 @@ typedef struct /* holds all objects */ struct PCBType *pcb; LayerType Layer[MAX_LAYER + 2]; /* add 2 silkscreen layers */ int polyClip; -} DataType, *DataTypePtr; +} DataType; typedef struct /* holds drill information */ { @@ -417,14 +417,14 @@ typedef struct /* holds drill information */ PinMax; /* max number of coordinates from malloc() */ PinType **Pin; /* coordinates to drill */ ElementType **Element; /* a pointer to an array of element pointers */ -} DrillType, *DrillTypePtr; +} DrillType; typedef struct /* holds a range of Drill Infos */ { Cardinal DrillN, /* number of drill sizes */ DrillMax; /* max number from malloc() */ DrillType *Drill; /* plated holes */ -} DrillInfoType, *DrillInfoTypePtr; +} DrillInfoType; typedef struct { @@ -434,7 +434,7 @@ typedef struct Keepaway; /* min. separation from other nets */ char *Name; int index; -} RouteStyleType, *RouteStyleTypePtr; +} RouteStyleType; /* --------------------------------------------------------------------------- * structure used by library routines @@ -448,8 +448,7 @@ typedef struct *Package, /* package */ *Value, /* the value field */ *Description; /* some descritional text */ -} LibraryEntryType, *LibraryEntryTypePtr; -//typedef LibraryEntryType *LibraryEntryTypePtr; +} LibraryEntryType; /* If the internal flag is set, the only field that is valid is Name, and the struct is allocated with malloc instead of @@ -467,14 +466,14 @@ typedef struct char flag; /* used by the netlist window to enable/disable nets */ char internal; /* if set, this is an internal-only entry, not part of the global netlist. */ -} LibraryMenuType, *LibraryMenuTypePtr; +} LibraryMenuType; typedef struct { Cardinal MenuN; /* number of objects */ Cardinal MenuMax; /* number of reserved memory locations */ LibraryMenuType *Menu; /* the entries */ -} LibraryType, *LibraryTypePtr; +} LibraryType; /* The PCBType struct holds information about board layout most of which is @@ -528,7 +527,7 @@ typedef struct PCBType bool is_footprint; /* If set, the user has loaded a footprint, not a pcb. */ } -PCBType, *PCBTypePtr; +PCBType; typedef struct /* information about the paste buffer */ { @@ -536,7 +535,7 @@ typedef struct /* information about the paste buffer */ BoxType BoundingBox; DataType *Data; /* data; not all members of PCBType */ /* are used */ -} BufferType, *BufferTypePtr; +} BufferType; /* --------------------------------------------------------------------------- * some types for cursor drawing, setting of block and lines @@ -547,7 +546,7 @@ typedef struct /* rubberband lines for element moves */ LayerType *Layer; /* layer that holds the line */ LineType *Line; /* the line itself */ PointType *MovedPoint; /* and finally the point */ -} RubberbandType, *RubberbandTypePtr; +} RubberbandType; typedef struct /* current marked line */ { @@ -555,7 +554,7 @@ typedef struct /* current marked line */ Point2; long int State; bool draw; -} AttachedLineType, *AttachedLineTypePtr; +} AttachedLineType; typedef struct /* currently marked block */ { @@ -563,7 +562,7 @@ typedef struct /* currently marked block */ Point2; long int State; bool otherway; -} AttachedBoxType, *AttachedBoxTypePtr; +} AttachedBoxType; typedef struct /* currently attached object */ { @@ -577,7 +576,7 @@ typedef struct /* currently attached object */ Cardinal RubberbandN, /* number of lines in array */ RubberbandMax; RubberbandType *Rubberband; -} AttachedObjectType, *AttachedObjectTypePtr; +} AttachedObjectType; enum crosshair_shape { @@ -599,13 +598,13 @@ typedef struct /* holds cursor information */ PolygonType AttachedPolygon; AttachedObjectType AttachedObject; /* data of attached objects */ enum crosshair_shape shape; /* shape of crosshair */ -} CrosshairType, *CrosshairTypePtr; +} CrosshairType; typedef struct { bool status; Coord X, Y; -} MarkType, *MarkTypePtr; +} MarkType; /* --------------------------------------------------------------------------- * our resources @@ -696,7 +695,7 @@ typedef struct /* some resources... */ AutoPlace; /* flag which says we should force placement of the windows on startup */ } -SettingType, *SettingTypePtr; +SettingType; /* ---------------------------------------------------------------------- * pointer to low-level copy, move and rotate functions @@ -715,7 +714,7 @@ typedef struct void *(*Point) (LayerType *, PolygonType *, PointType *); void *(*Arc) (LayerType *, ArcType *); void *(*Rat) (RatType *); -} ObjectFunctionType, *ObjectFunctionTypePtr; +} ObjectFunctionType; /* --------------------------------------------------------------------------- * structure used by device drivers @@ -728,7 +727,7 @@ typedef struct /* holds a connection */ void *ptr1, *ptr2; /* the object of the connection */ Cardinal group; /* the layer group of the connection */ LibraryMenuType *menu; /* the netmenu this *SHOULD* belong too */ -} ConnectionType, *ConnectionTypePtr; +} ConnectionType; typedef struct /* holds a net of connections */ { @@ -736,28 +735,28 @@ typedef struct /* holds a net of connections */ ConnectionMax; /* max connections from malloc */ ConnectionType *Connection; RouteStyleType *Style; -} NetType, *NetTypePtr; +} NetType; typedef struct /* holds a list of nets */ { Cardinal NetN, /* the number of subnets contained */ NetMax; /* max subnets from malloc */ NetType *Net; -} NetListType, *NetListTypePtr; +} NetListType; typedef struct /* holds a list of net lists */ { Cardinal NetListN, /* the number of net lists contained */ NetListMax; /* max net lists from malloc */ NetListType *NetList; -} NetListListType, *NetListListTypePtr; +} NetListListType; typedef struct /* holds a generic list of pointers */ { Cardinal PtrN, /* the number of pointers contained */ PtrMax; /* max subnets from malloc */ void **Ptr; -} PointerListType, *PointerListTypePtr; +} PointerListType; typedef struct { @@ -765,7 +764,7 @@ typedef struct BoxMax; /* max boxes from malloc */ BoxType *Box; -} BoxListType, *BoxListTypePtr; +} BoxListType; struct drc_violation_st { diff --git a/src/mymem.h b/src/mymem.h index 71c0a84..46061a3 100644 --- a/src/mymem.h +++ b/src/mymem.h @@ -62,7 +62,7 @@ typedef struct { size_t MaxLength; char *Data; -} DynamicStringType, *DynamicStringTypePtr; +} DynamicStringType; RubberbandType * GetRubberbandMemory (void); PinType * GetPinMemory (ElementType *); commit 9f239a9c2e0a16c15070d90cb128d3688da0ebac Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove usage of *TypePtr and *TypeHandle type aliases Coverity already caught several bugs where we mixed up the various FooType FooTypePtr and FooTypeHandle types when passing to sizeof(). Personally I find it much easier to follow FooType * and FooType **, so drop the aliases and hopefully keep things earier to follow. diff --git a/src/action.c b/src/action.c index b1c33ab..affefba 100644 --- a/src/action.c +++ b/src/action.c @@ -216,7 +216,7 @@ typedef struct /* used to identify subfunctions */ char *Identifier; FunctionID ID; } -FunctionType, *FunctionTypePtr; +FunctionType; /* --------------------------------------------------------------------------- */ @@ -295,10 +295,10 @@ either round or, if the octagon flag is set, octagonal. * some local identifiers */ static PointType InsertedPoint; -static LayerTypePtr lastLayer; +static LayerType *lastLayer; static struct { - PolygonTypePtr poly; + PolygonType *poly; LineType line; } fake; @@ -823,7 +823,7 @@ AdjustAttachedBox (void) void AdjustAttachedObjects (void) { - PointTypePtr pnt; + PointType *pnt; switch (Settings.Mode) { /* update at least an attached block (selection) */ @@ -897,13 +897,13 @@ NotifyLine (void) if (type == PIN_TYPE || type == VIA_TYPE) { Crosshair.AttachedLine.Point1.X = - Crosshair.AttachedLine.Point2.X = ((PinTypePtr) ptr2)->X; + Crosshair.AttachedLine.Point2.X = ((PinType *) ptr2)->X; Crosshair.AttachedLine.Point1.Y = - Crosshair.AttachedLine.Point2.Y = ((PinTypePtr) ptr2)->Y; + Crosshair.AttachedLine.Point2.Y = ((PinType *) ptr2)->Y; } else if (type == PAD_TYPE) { - PadTypePtr pad = (PadTypePtr) ptr2; + PadType *pad = (PadType *) ptr2; double d1 = Distance (Crosshair.X, Crosshair.Y, pad->Point1.X, pad->Point1.Y); double d2 = Distance (Crosshair.X, Crosshair.Y, pad->Point2.X, pad->Point2.Y); if (d2 < d1) @@ -996,7 +996,7 @@ NotifyMode (void) { type = SearchScreen (Note.X, Note.Y, test, &ptr1, &ptr2, &ptr3); if (!Note.Hit && (type & MOVE_TYPES) && - !TEST_FLAG (LOCKFLAG, (PinTypePtr) ptr2)) + !TEST_FLAG (LOCKFLAG, (PinType *) ptr2)) { Note.Hit = type; Note.ptr1 = ptr1; @@ -1004,7 +1004,7 @@ NotifyMode (void) Note.ptr3 = ptr3; } if (!Note.Moving && (type & SELECT_TYPES) && - TEST_FLAG (SELECTEDFLAG, (PinTypePtr) ptr2)) + TEST_FLAG (SELECTEDFLAG, (PinType *) ptr2)) Note.Moving = true; if ((Note.Hit && Note.Moving) || type == NO_TYPE) break; @@ -1014,7 +1014,7 @@ NotifyMode (void) case VIA_MODE: { - PinTypePtr via; + PinType *via; if (!PCB->ViaOn) { @@ -1052,7 +1052,7 @@ NotifyMode (void) case STATE_SECOND: case STATE_THIRD: { - ArcTypePtr arc; + ArcType *arc; Coord wx, wy; Angle sa, dir; @@ -1105,7 +1105,7 @@ NotifyMode (void) CLEARLINEFLAG : 0)))) { - BoxTypePtr bx; + BoxType *bx; bx = GetArcEnds (arc); Crosshair.AttachedBox.Point1.X = @@ -1129,7 +1129,7 @@ NotifyMode (void) type = SearchScreen (Note.X, Note.Y, LOCK_TYPES, &ptr1, &ptr2, &ptr3); if (type == ELEMENT_TYPE) { - ElementTypePtr element = (ElementTypePtr) ptr2; + ElementType *element = (ElementType *) ptr2; TOGGLE_FLAG (LOCKFLAG, element); PIN_LOOP (element); @@ -1154,7 +1154,7 @@ NotifyMode (void) } else if (type != NO_TYPE) { - TextTypePtr thing = (TextTypePtr) ptr3; + TextType *thing = (TextType *) ptr3; TOGGLE_FLAG (LOCKFLAG, thing); if (TEST_FLAG (LOCKFLAG, thing) && TEST_FLAG (SELECTEDFLAG, thing)) @@ -1174,17 +1174,17 @@ NotifyMode (void) = SearchScreen (Note.X, Note.Y, PIN_TYPES, &ptr1, &ptr2, &ptr3)) != NO_TYPE) - && !TEST_FLAG (HOLEFLAG, (PinTypePtr) ptr3)) + && !TEST_FLAG (HOLEFLAG, (PinType *) ptr3)) { if (gui->shift_is_pressed ()) { - int tstyle = GET_THERM (INDEXOFCURRENT, (PinTypePtr) ptr3); + int tstyle = GET_THERM (INDEXOFCURRENT, (PinType *) ptr3); tstyle++; if (tstyle > 5) tstyle = 1; ChangeObjectThermal (type, ptr1, ptr2, ptr3, tstyle); } - else if (GET_THERM (INDEXOFCURRENT, (PinTypePtr) ptr3)) + else if (GET_THERM (INDEXOFCURRENT, (PinType *) ptr3)) ChangeObjectThermal (type, ptr1, ptr2, ptr3, 0); else ChangeObjectThermal (type, ptr1, ptr2, ptr3, PCB->ThermStyle); @@ -1213,7 +1213,7 @@ NotifyMode (void) if (PCB->RatDraw) { - RatTypePtr line; + RatType *line; if ((line = AddNet ())) { addedLines++; @@ -1231,7 +1231,7 @@ NotifyMode (void) else /* create line if both ends are determined && length != 0 */ { - LineTypePtr line; + LineType *line; int maybe_found_flag; if (PCB->Clipping @@ -1273,7 +1273,7 @@ NotifyMode (void) PCB) ? CLEARLINEFLAG : 0)))) != NULL) { - PinTypePtr via; + PinType *via; addedLines++; AddObjectToCreateUndoList (LINE_TYPE, CURRENT, line, line); @@ -1355,7 +1355,7 @@ NotifyMode (void) Crosshair.AttachedBox.Point1.X != Crosshair.AttachedBox.Point2.X && Crosshair.AttachedBox.Point1.Y != Crosshair.AttachedBox.Point2.Y) { - PolygonTypePtr polygon; + PolygonType *polygon; int flags = CLEARPOLYFLAG; if (TEST_FLAG (NEWFULLPOLYFLAG, PCB)) @@ -1393,7 +1393,7 @@ NotifyMode (void) { if (strlen(string) > 0) { - TextTypePtr text; + TextType *text; int flag = CLEARLINEFLAG; if (GetLayerGroupNumberByNumber (INDEXOFCURRENT) == @@ -1416,7 +1416,7 @@ NotifyMode (void) case POLYGON_MODE: { - PointTypePtr points = Crosshair.AttachedPolygon.Points; + PointType *points = Crosshair.AttachedPolygon.Points; Cardinal n = Crosshair.AttachedPolygon.PointN; /* do update of position; use the 'LINE_MODE' mechanism */ @@ -1464,7 +1464,7 @@ NotifyMode (void) if (Crosshair.AttachedObject.Type != NO_TYPE) { - if (TEST_FLAG (LOCKFLAG, (PolygonTypePtr) + if (TEST_FLAG (LOCKFLAG, (PolygonType *) Crosshair.AttachedObject.Ptr2)) { Message (_("Sorry, the object is locked\n")); @@ -1479,7 +1479,7 @@ NotifyMode (void) /* second notify, insert new point into object */ case STATE_SECOND: { - PointTypePtr points = Crosshair.AttachedPolygon.Points; + PointType *points = Crosshair.AttachedPolygon.Points; Cardinal n = Crosshair.AttachedPolygon.PointN; POLYAREA *original, *new_hole, *result; FlagType Flags; @@ -1548,7 +1548,7 @@ NotifyMode (void) case PASTEBUFFER_MODE: { TextType estr[MAX_ELEMENTNAMES]; - ElementTypePtr e = 0; + ElementType *e = 0; if (gui->shift_is_pressed ()) { @@ -1557,7 +1557,7 @@ NotifyMode (void) &ptr3); if (type == ELEMENT_TYPE) { - e = (ElementTypePtr) ptr1; + e = (ElementType *) ptr1; if (e) { int i; @@ -1580,7 +1580,7 @@ NotifyMode (void) if (type == ELEMENT_TYPE && ptr1) { int i, save_n; - e = (ElementTypePtr) ptr1; + e = (ElementType *) ptr1; save_n = NAME_INDEX (PCB); @@ -1608,14 +1608,14 @@ NotifyMode (void) SearchScreen (Note.X, Note.Y, REMOVE_TYPES, &ptr1, &ptr2, &ptr3)) != NO_TYPE) { - if (TEST_FLAG (LOCKFLAG, (LineTypePtr) ptr2)) + if (TEST_FLAG (LOCKFLAG, (LineType *) ptr2)) { Message (_("Sorry, the object is locked\n")); break; } if (type == ELEMENT_TYPE) { - RubberbandTypePtr ptr; + RubberbandType *ptr; int i; Crosshair.AttachedObject.RubberbandN = 0; @@ -1624,7 +1624,7 @@ NotifyMode (void) for (i = 0; i < Crosshair.AttachedObject.RubberbandN; i++) { if (PCB->RatOn) - EraseRat ((RatTypePtr) ptr->Line); + EraseRat ((RatType *) ptr->Line); if (TEST_FLAG (RUBBERENDFLAG, ptr->Line)) MoveObjectToRemoveUndoList (RATLINE_TYPE, ptr->Line, ptr->Line, @@ -1666,7 +1666,7 @@ NotifyMode (void) if (Crosshair.AttachedObject.Type != NO_TYPE) { if (Settings.Mode == MOVE_MODE && - TEST_FLAG (LOCKFLAG, (PinTypePtr) + TEST_FLAG (LOCKFLAG, (PinType *) Crosshair.AttachedObject.Ptr2)) { Message (_("Sorry, the object is locked\n")); @@ -1720,7 +1720,7 @@ NotifyMode (void) if (Crosshair.AttachedObject.Type != NO_TYPE) { - if (TEST_FLAG (LOCKFLAG, (PolygonTypePtr) + if (TEST_FLAG (LOCKFLAG, (PolygonType *) Crosshair.AttachedObject.Ptr2)) { Message (_("Sorry, the object is locked\n")); @@ -1733,7 +1733,7 @@ NotifyMode (void) if (Crosshair.AttachedObject.Type == POLYGON_TYPE) { fake.poly = - (PolygonTypePtr) Crosshair.AttachedObject.Ptr2; + (PolygonType *) Crosshair.AttachedObject.Ptr2; polyIndex = GetLowestDistancePolygonPoint (fake.poly, Note.X, Note.Y); @@ -1955,7 +1955,7 @@ static int ActionFlip (int argc, char **argv, Coord x, Coord y) { char *function = ARG (0); - ElementTypePtr element; + ElementType *element; void *ptrtmp; int err = 0; @@ -1967,7 +1967,7 @@ ActionFlip (int argc, char **argv, Coord x, Coord y) if ((SearchScreen (x, y, ELEMENT_TYPE, &ptrtmp, &ptrtmp, &ptrtmp)) != NO_TYPE) { - element = (ElementTypePtr) ptrtmp; + element = (ElementType *) ptrtmp; ChangeElementSide (element, 2 * Crosshair.Y - PCB->MaxHeight); IncrementUndoSerialNumber (); Draw (); @@ -2821,7 +2821,7 @@ ActionDisplay (int argc, char **argv, Coord childX, Coord childY) /* display the pinout of an element */ case F_Pinout: { - ElementTypePtr element; + ElementType *element; void *ptrtmp; Coord x, y; @@ -2830,7 +2830,7 @@ ActionDisplay (int argc, char **argv, Coord childX, Coord childY) (x, y, ELEMENT_TYPE, &ptrtmp, &ptrtmp, &ptrtmp)) != NO_TYPE) { - element = (ElementTypePtr) ptrtmp; + element = (ElementType *) ptrtmp; gui->show_item (element); } break; @@ -2847,7 +2847,7 @@ ActionDisplay (int argc, char **argv, Coord childX, Coord childY) (void **) &ptr3)) { case ELEMENT_TYPE: - PIN_LOOP ((ElementTypePtr) ptr1); + PIN_LOOP ((ElementType *) ptr1); { if (TEST_FLAG (DISPLAYNAMEFLAG, pin)) ErasePinName (pin); @@ -2857,7 +2857,7 @@ ActionDisplay (int argc, char **argv, Coord childX, Coord childY) TOGGLE_FLAG (DISPLAYNAMEFLAG, pin); } END_LOOP; - PAD_LOOP ((ElementTypePtr) ptr1); + PAD_LOOP ((ElementType *) ptr1); { if (TEST_FLAG (DISPLAYNAMEFLAG, pad)) ErasePadName (pad); @@ -2873,35 +2873,35 @@ ActionDisplay (int argc, char **argv, Coord childX, Coord childY) break; case PIN_TYPE: - if (TEST_FLAG (DISPLAYNAMEFLAG, (PinTypePtr) ptr2)) - ErasePinName ((PinTypePtr) ptr2); + if (TEST_FLAG (DISPLAYNAMEFLAG, (PinType *) ptr2)) + ErasePinName ((PinType *) ptr2); else - DrawPinName ((PinTypePtr) ptr2); + DrawPinName ((PinType *) ptr2); AddObjectToFlagUndoList (PIN_TYPE, ptr1, ptr2, ptr3); - TOGGLE_FLAG (DISPLAYNAMEFLAG, (PinTypePtr) ptr2); + TOGGLE_FLAG (DISPLAYNAMEFLAG, (PinType *) ptr2); SetChangedFlag (true); IncrementUndoSerialNumber (); Draw (); break; case PAD_TYPE: - if (TEST_FLAG (DISPLAYNAMEFLAG, (PadTypePtr) ptr2)) - ErasePadName ((PadTypePtr) ptr2); + if (TEST_FLAG (DISPLAYNAMEFLAG, (PadType *) ptr2)) + ErasePadName ((PadType *) ptr2); else - DrawPadName ((PadTypePtr) ptr2); + DrawPadName ((PadType *) ptr2); AddObjectToFlagUndoList (PAD_TYPE, ptr1, ptr2, ptr3); - TOGGLE_FLAG (DISPLAYNAMEFLAG, (PadTypePtr) ptr2); + TOGGLE_FLAG (DISPLAYNAMEFLAG, (PadType *) ptr2); SetChangedFlag (true); IncrementUndoSerialNumber (); Draw (); break; case VIA_TYPE: - if (TEST_FLAG (DISPLAYNAMEFLAG, (PinTypePtr) ptr2)) - EraseViaName ((PinTypePtr) ptr2); + if (TEST_FLAG (DISPLAYNAMEFLAG, (PinType *) ptr2)) + EraseViaName ((PinType *) ptr2); else - DrawViaName ((PinTypePtr) ptr2); + DrawViaName ((PinType *) ptr2); AddObjectToFlagUndoList (VIA_TYPE, ptr1, ptr2, ptr3); - TOGGLE_FLAG (DISPLAYNAMEFLAG, (PinTypePtr) ptr2); + TOGGLE_FLAG (DISPLAYNAMEFLAG, (PinType *) ptr2); SetChangedFlag (true); IncrementUndoSerialNumber (); Draw (); @@ -3248,8 +3248,8 @@ static int ActionRenumber (int argc, char **argv, Coord x, Coord y) { bool changed = false; - ElementTypePtr *element_list; - ElementTypePtr *locked_element_list; + ElementType **element_list; + ElementType **locked_element_list; unsigned int i, j, k, cnt, lock_cnt; unsigned int tmpi; size_t sz; @@ -3329,8 +3329,8 @@ ActionRenumber (int argc, char **argv, Coord x, Coord y) * * We'll actually renumber things in the 2nd pass. */ - element_list = (ElementType **)calloc (PCB->Data->ElementN, sizeof (ElementTypePtr)); - locked_element_list = (ElementType **)calloc (PCB->Data->ElementN, sizeof (ElementTypePtr)); + element_list = (ElementType **)calloc (PCB->Data->ElementN, sizeof (ElementType *)); + locked_element_list = (ElementType **)calloc (PCB->Data->ElementN, sizeof (ElementType *)); was = (char **)calloc (PCB->Data->ElementN, sizeof (char *)); is = (char **)calloc (PCB->Data->ElementN, sizeof (char *)); if (element_list == NULL || locked_element_list == NULL || was == NULL @@ -3745,7 +3745,7 @@ static int ActionAddRats (int argc, char **argv, Coord x, Coord y) { char *function = ARG (0); - RatTypePtr shorty; + RatType *shorty; float len, small; if (function) @@ -4056,7 +4056,7 @@ ActionChangeSize (int argc, char **argv, Coord x, Coord y) if ((type = SearchScreen (Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != NO_TYPE) - if (TEST_FLAG (LOCKFLAG, (PinTypePtr) ptr2)) + if (TEST_FLAG (LOCKFLAG, (PinType *) ptr2)) Message (_("Sorry, the object is locked\n")); if (ChangeObjectSize (type, ptr1, ptr2, ptr3, value, absolute)) SetChangedFlag (true); @@ -4586,7 +4586,7 @@ ActionChangeName (int argc, char **argv, Coord x, Coord y) SetChangedFlag (true); if (type == ELEMENT_TYPE) { - RubberbandTypePtr ptr; + RubberbandType *ptr; int i; RestoreUndoSerialNumber (); @@ -4597,7 +4597,7 @@ ActionChangeName (int argc, char **argv, Coord x, Coord y) i++, ptr++) { if (PCB->RatOn) - EraseRat ((RatTypePtr) ptr->Line); + EraseRat ((RatType *) ptr->Line); MoveObjectToRemoveUndoList (RATLINE_TYPE, ptr->Line, ptr->Line, ptr->Line); @@ -4722,9 +4722,9 @@ ActionToggleHideName (int argc, char **argv, Coord x, Coord y) &ptr1, &ptr2, &ptr3)) != NO_TYPE) { AddObjectToFlagUndoList (type, ptr1, ptr2, ptr3); - EraseElementName ((ElementTypePtr) ptr2); - TOGGLE_FLAG (HIDENAMEFLAG, (ElementTypePtr) ptr2); - DrawElementName ((ElementTypePtr) ptr2); + EraseElementName ((ElementType *) ptr2); + TOGGLE_FLAG (HIDENAMEFLAG, (ElementType *) ptr2); + DrawElementName ((ElementType *) ptr2); Draw (); IncrementUndoSerialNumber (); } @@ -5218,7 +5218,7 @@ ActionChangeHole (int argc, char **argv, Coord x, Coord y) gui->get_coords (_("Select an Object"), &x, &y); if ((type = SearchScreen (x, y, VIA_TYPE, &ptr1, &ptr2, &ptr3)) != NO_TYPE - && ChangeHole ((PinTypePtr) ptr3)) + && ChangeHole ((PinType *) ptr3)) IncrementUndoSerialNumber (); break; } @@ -5266,7 +5266,7 @@ ActionChangePaste (int argc, char **argv, Coord x, Coord y) gui->get_coords (_("Select an Object"), &x, &y); if ((type = SearchScreen (x, y, PAD_TYPE, &ptr1, &ptr2, &ptr3)) != NO_TYPE - && ChangePaste ((PadTypePtr) ptr3)) + && ChangePaste ((PadType *) ptr3)) IncrementUndoSerialNumber (); break; } @@ -5721,7 +5721,7 @@ ActionSaveTo (int argc, char **argv, Coord x, Coord y) if (strcasecmp (function, "ElementConnections") == 0) { - ElementTypePtr element; + ElementType *element; void *ptrtmp; FILE *fp; bool result; @@ -5729,7 +5729,7 @@ ActionSaveTo (int argc, char **argv, Coord x, Coord y) if ((SearchScreen (Crosshair.X, Crosshair.Y, ELEMENT_TYPE, &ptrtmp, &ptrtmp, &ptrtmp)) != NO_TYPE) { - element = (ElementTypePtr) ptrtmp; + element = (ElementType *) ptrtmp; if ((fp = CheckAndOpenFile (name, true, false, &result, NULL)) != NULL) { @@ -6197,13 +6197,13 @@ ActionUndo (int argc, char **argv, Coord x, Coord y) { int type; void *ptr1, *ptr3, *ptrtmp; - LineTypePtr ptr2; + LineType *ptr2; /* this search is guaranteed to succeed */ SearchObjectByLocation (LINE_TYPE | RATLINE_TYPE, &ptr1, &ptrtmp, &ptr3, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, 0); - ptr2 = (LineTypePtr) ptrtmp; + ptr2 = (LineType *) ptrtmp; /* save both ends of line */ Crosshair.AttachedLine.Point2.X = ptr2->Point1.X; @@ -6235,7 +6235,7 @@ ActionUndo (int argc, char **argv, Coord x, Coord y) &ptr3, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y, 0); - ptr2 = (LineTypePtr) ptrtmp; + ptr2 = (LineType *) ptrtmp; if (TEST_FLAG (AUTODRCFLAG, PCB)) { /* undo loses FOUNDFLAG */ @@ -6262,8 +6262,8 @@ ActionUndo (int argc, char **argv, Coord x, Coord y) &ptr3, Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, 0); - ptr2 = (LineTypePtr) ptrtmp; - lastLayer = (LayerTypePtr) ptr1; + ptr2 = (LineType *) ptrtmp; + lastLayer = (LayerType *) ptr1; } notify_crosshair_change (true); return 0; @@ -6280,12 +6280,12 @@ ActionUndo (int argc, char **argv, Coord x, Coord y) if (Crosshair.AttachedBox.State == STATE_THIRD) { void *ptr1, *ptr2, *ptr3; - BoxTypePtr bx; + BoxType *bx; /* guaranteed to succeed */ SearchObjectByLocation (ARC_TYPE, &ptr1, &ptr2, &ptr3, Crosshair.AttachedBox.Point1.X, Crosshair.AttachedBox.Point1.Y, 0); - bx = GetArcEnds ((ArcTypePtr) ptr2); + bx = GetArcEnds ((ArcType *) ptr2); Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = bx->X1; Crosshair.AttachedBox.Point1.Y = @@ -6561,7 +6561,7 @@ ActionSetSame (int argc, char **argv, Coord x, Coord y) { void *ptr1, *ptr2, *ptr3; int type; - LayerTypePtr layer = CURRENT; + LayerType *layer = CURRENT; type = SearchScreen (x, y, CLONE_TYPES, &ptr1, &ptr2, &ptr3); /* set layer current and size from line or arc */ @@ -6569,9 +6569,9 @@ ActionSetSame (int argc, char **argv, Coord x, Coord y) { case LINE_TYPE: notify_crosshair_change (false); - Settings.LineThickness = ((LineTypePtr) ptr2)->Thickness; - Settings.Keepaway = ((LineTypePtr) ptr2)->Clearance / 2; - layer = (LayerTypePtr) ptr1; + Settings.LineThickness = ((LineType *) ptr2)->Thickness; + Settings.Keepaway = ((LineType *) ptr2)->Clearance / 2; + layer = (LayerType *) ptr1; if (Settings.Mode != LINE_MODE) SetMode (LINE_MODE); notify_crosshair_change (true); @@ -6580,9 +6580,9 @@ ActionSetSame (int argc, char **argv, Coord x, Coord y) case ARC_TYPE: notify_crosshair_change (false); - Settings.LineThickness = ((ArcTypePtr) ptr2)->Thickness; - Settings.Keepaway = ((ArcTypePtr) ptr2)->Clearance / 2; - layer = (LayerTypePtr) ptr1; + Settings.LineThickness = ((ArcType *) ptr2)->Thickness; + Settings.Keepaway = ((ArcType *) ptr2)->Clearance / 2; + layer = (LayerType *) ptr1; if (Settings.Mode != ARC_MODE) SetMode (ARC_MODE); notify_crosshair_change (true); @@ -6590,14 +6590,14 @@ ActionSetSame (int argc, char **argv, Coord x, Coord y) break; case POLYGON_TYPE: - layer = (LayerTypePtr) ptr1; + layer = (LayerType *) ptr1; break; case VIA_TYPE: notify_crosshair_change (false); - Settings.ViaThickness = ((PinTypePtr) ptr2)->Thickness; - Settings.ViaDrillingHole = ((PinTypePtr) ptr2)->DrillingHole; - Settings.Keepaway = ((PinTypePtr) ptr2)->Clearance / 2; + Settings.ViaThickness = ((PinType *) ptr2)->Thickness; + Settings.ViaDrillingHole = ((PinType *) ptr2)->DrillingHole; + Settings.Keepaway = ((PinType *) ptr2)->Clearance / 2; if (Settings.Mode != VIA_MODE) SetMode (VIA_MODE); notify_crosshair_change (true); @@ -6752,7 +6752,7 @@ ChangeFlag (char *what, char *flag_name, int value, char *cmd_name) if ((type = SearchScreen (Crosshair.X, Crosshair.Y, CHANGESIZE_TYPES, &ptr1, &ptr2, &ptr3)) != NO_TYPE) - if (TEST_FLAG (LOCKFLAG, (PinTypePtr) ptr2)) + if (TEST_FLAG (LOCKFLAG, (PinType *) ptr2)) Message (_("Sorry, the object is locked\n")); if (set_object (type, ptr1, ptr2, ptr3)) SetChangedFlag (true); @@ -6909,7 +6909,7 @@ find_element_by_refdes (char *refdes) } static AttributeType * -lookup_attr (AttributeListTypePtr list, const char *name) +lookup_attr (AttributeListType *list, const char *name) { int i; for (i=0; i<list->Number; i++) @@ -6919,7 +6919,7 @@ lookup_attr (AttributeListTypePtr list, const char *name) } static void -delete_attr (AttributeListTypePtr list, AttributeType *attr) +delete_attr (AttributeListType *list, AttributeType *attr) { int idx = attr - list->List; if (idx < 0 || idx >= list->Number) @@ -7946,7 +7946,7 @@ ActionAttributes (int argc, char **argv, Coord x, Coord y) if ((SearchScreen (x, y, ELEMENT_TYPE, &ptrtmp, &ptrtmp, &ptrtmp)) != NO_TYPE) - e = (ElementTypePtr) ptrtmp; + e = (ElementType *) ptrtmp; else { Message (_("No element found there\n")); diff --git a/src/autoplace.c b/src/autoplace.c index e7cdee8..21ab5f2 100644 --- a/src/autoplace.c +++ b/src/autoplace.c @@ -74,7 +74,7 @@ /* --------------------------------------------------------------------------- * some local prototypes */ -static double ComputeCost (NetListTypePtr Nets, double T0, double T); +static double ComputeCost (NetListType *Nets, double T0, double T); /* --------------------------------------------------------------------------- * some local types @@ -123,7 +123,7 @@ CostParameter = typedef struct { - ElementTypePtr *element; + ElementType **element; Cardinal elementN; } ElementPtrListType; @@ -133,11 +133,11 @@ enum ewhich typedef struct { - ElementTypePtr element; + ElementType *element; enum ewhich which; Coord DX, DY; /* for shift */ unsigned rotate; /* for rotate/flip */ - ElementTypePtr other; /* for exchange */ + ElementType *other; /* for exchange */ } PerturbationType; @@ -150,7 +150,7 @@ PerturbationType; * elements have possibly been moved, rotated, flipped, etc. */ static void -UpdateXY (NetListTypePtr Nets) +UpdateXY (NetListType *Nets) { Cardinal SLayer, CLayer; Cardinal i, j; @@ -162,20 +162,20 @@ UpdateXY (NetListTypePtr Nets) { for (j = 0; j < Nets->Net[i].ConnectionN; j++) { - ConnectionTypePtr c = &(Nets->Net[i].Connection[j]); + ConnectionType *c = &(Nets->Net[i].Connection[j]); switch (c->type) { case PAD_TYPE: c->group = TEST_FLAG (ONSOLDERFLAG, - (ElementTypePtr) c->ptr1) + (ElementType *) c->ptr1) ? SLayer : CLayer; - c->X = ((PadTypePtr) c->ptr2)->Point1.X; - c->Y = ((PadTypePtr) c->ptr2)->Point1.Y; + c->X = ((PadType *) c->ptr2)->Point1.X; + c->Y = ((PadType *) c->ptr2)->Point1.Y; break; case PIN_TYPE: c->group = SLayer; /* any layer will do */ - c->X = ((PinTypePtr) c->ptr2)->X; - c->Y = ((PinTypePtr) c->ptr2)->Y; + c->X = ((PinType *) c->ptr2)->X; + c->Y = ((PinType *) c->ptr2)->Y; break; default: Message ("Odd connection type encountered in " "UpdateXY"); @@ -196,7 +196,7 @@ collectSelectedElements () { if (TEST_FLAG (SELECTEDFLAG, element)) { - ElementTypePtr *epp = (ElementTypePtr *) GetPointerMemory (&list); + ElementType **epp = (ElementType **) GetPointerMemory (&list); *epp = element; } } @@ -208,10 +208,10 @@ collectSelectedElements () #include "create.h" /* makes a line on the solder layer surrounding all boxes in blist */ static void -showboxes (BoxListTypePtr blist) +showboxes (BoxListType *blist) { Cardinal i; - LayerTypePtr SLayer = &(PCB->Data->Layer[solder_silk_layer]); + LayerType *SLayer = &(PCB->Data->Layer[solder_silk_layer]); for (i = 0; i < blist->BoxN; i++) { CreateNewLineOnLayer (SLayer, blist->Box[i].X1, blist->Box[i].Y1, @@ -323,7 +323,7 @@ r_find_neighbor (rtree_t * rtree, const BoxType * box, * Marcel Dekker, Inc. 1993. ISBN: 0-8247-8916-4 TK7868.P7.P57 1993 */ static double -ComputeCost (NetListTypePtr Nets, double T0, double T) +ComputeCost (NetListType *Nets, double T0, double T) { double W = 0; /* wire cost */ double delta1 = 0; /* wire congestion penalty function */ @@ -346,7 +346,7 @@ ComputeCost (NetListTypePtr Nets, double T0, double T) * the "layer height" of the net. */ for (i = 0; i < Nets->NetN; i++) { - NetTypePtr n = &Nets->Net[i]; + NetType *n = &Nets->Net[i]; if (n->ConnectionN < 2) continue; /* no cost to go nowhere */ minx = maxx = n->Connection[0].X; @@ -356,7 +356,7 @@ ComputeCost (NetListTypePtr Nets, double T0, double T) allsameside = true; for (j = 1; j < n->ConnectionN; j++) { - ConnectionTypePtr c = &(n->Connection[j]); + ConnectionType *c = &(n->Connection[j]); MAKEMIN (minx, c->X); MAKEMAX (maxx, c->X); MAKEMIN (miny, c->Y); @@ -368,7 +368,7 @@ ComputeCost (NetListTypePtr Nets, double T0, double T) } /* save bounding rectangle */ { - BoxTypePtr box = GetBoxMemory (&bounds); + BoxType *box = GetBoxMemory (&bounds); box->X1 = minx; box->Y1 = miny; box->X2 = maxx; @@ -393,10 +393,10 @@ ComputeCost (NetListTypePtr Nets, double T0, double T) ELEMENT_LOOP (PCB->Data); { - BoxListTypePtr thisside; - BoxListTypePtr otherside; - BoxTypePtr box; - BoxTypePtr lastbox = NULL; + BoxListType *thisside; + BoxListType *otherside; + BoxType *box; + BoxType *lastbox = NULL; Coord thickness; Coord clearance; if (TEST_FLAG (ONSOLDERFLAG, element)) @@ -514,7 +514,7 @@ ComputeCost (NetListTypePtr Nets, double T0, double T) struct ebox { BoxType box; - ElementTypePtr element; + ElementType *element; }; direction_t dir[4] = { NORTH, EAST, SOUTH, WEST }; struct ebox **boxpp, *boxp; @@ -613,11 +613,11 @@ ComputeCost (NetListTypePtr Nets, double T0, double T) * -- Only perturb selected elements (need count/list of selected?) -- */ PerturbationType -createPerturbation (PointerListTypePtr selected, double T) +createPerturbation (PointerListType *selected, double T) { PerturbationType pt = { 0 }; /* pick element to perturb */ - pt.element = (ElementTypePtr) selected->Ptr[random () % selected->PtrN]; + pt.element = (ElementType *) selected->Ptr[random () % selected->PtrN]; /* exchange, flip/rotate or shift? */ switch (random () % ((selected->PtrN > 1) ? 3 : 2)) { @@ -655,10 +655,10 @@ createPerturbation (PointerListTypePtr selected, double T) case 2: { /* exchange! */ pt.which = EXCHANGE; - pt.other = (ElementTypePtr) + pt.other = (ElementType *) selected->Ptr[random () % (selected->PtrN - 1)]; if (pt.other == pt.element) - pt.other = (ElementTypePtr) selected->Ptr[selected->PtrN - 1]; + pt.other = (ElementType *) selected->Ptr[selected->PtrN - 1]; /* don't allow exchanging a solderside-side SMD component * with a non-SMD component. */ if ((pt.element->PinN != 0 /* non-SMD */ && @@ -748,7 +748,7 @@ doPerturb (PerturbationType * pt, bool undo) bool AutoPlaceSelected (void) { - NetListTypePtr Nets; + NetListType *Nets; PointerListType Selected = { 0, 0, NULL }; PerturbationType pt; double C0, T0; diff --git a/src/autoroute.c b/src/autoroute.c index 374b6ac..8081262 100644 --- a/src/autoroute.c +++ b/src/autoroute.c @@ -231,12 +231,12 @@ typedef struct routebox BoxType box, sbox; union { - PadTypePtr pad; - PinTypePtr pin; - PinTypePtr via; + PadType *pad; + PinType *pin; + PinType *via; struct routebox *via_shadow; /* points to the via in r-tree which * points to the PinType in the PCB. */ - LineTypePtr line; + LineType *line; void *generic; /* 'other' is polygon, arc, text */ struct routebox *expansion_area; /* previous expansion area in search */ } @@ -639,7 +639,7 @@ point_in_shrunk_box (const routebox_t * box, Coord X, Coord Y) */ static routebox_t * -AddPin (PointerListType layergroupboxes[], PinTypePtr pin, bool is_via, +AddPin (PointerListType layergroupboxes[], PinType *pin, bool is_via, RouteStyleType * style) { routebox_t **rbpp, *lastrb = NULL; @@ -687,7 +687,7 @@ AddPin (PointerListType layergroupboxes[], PinTypePtr pin, bool is_via, } static routebox_t * AddPad (PointerListType layergroupboxes[], - ElementTypePtr element, PadTypePtr pad, RouteStyleType * style) + ElementType *element, PadType *pad, RouteStyleType * style) { Coord halfthick; routebox_t **rbpp; @@ -721,8 +721,8 @@ AddPad (PointerListType layergroupboxes[], return *rbpp; } static routebox_t * -AddLine (PointerListType layergroupboxes[], int layergroup, LineTypePtr line, - LineTypePtr ptr, RouteStyleType * style) +AddLine (PointerListType layergroupboxes[], int layergroup, LineType *line, + LineType *ptr, RouteStyleType * style) { routebox_t **rbpp; assert (layergroupboxes && line); @@ -794,7 +794,7 @@ AddIrregularObstacle (PointerListType layergroupboxes[], static routebox_t * AddPolygon (PointerListType layergroupboxes[], Cardinal layer, - PolygonTypePtr polygon, RouteStyleType * style) + PolygonType *polygon, RouteStyleType * style) { int is_not_rectangle = 1; int layergroup = GetLayerGroupNumberByNumber (layer); @@ -830,7 +830,7 @@ AddPolygon (PointerListType layergroupboxes[], Cardinal layer, } static void AddText (PointerListType layergroupboxes[], Cardinal layergroup, - TextTypePtr text, RouteStyleType * style) + TextType *text, RouteStyleType * style) { AddIrregularObstacle (layergroupboxes, text->BoundingBox.X1, text->BoundingBox.Y1, @@ -839,7 +839,7 @@ AddText (PointerListType layergroupboxes[], Cardinal layergroup, } static routebox_t * AddArc (PointerListType layergroupboxes[], Cardinal layergroup, - ArcTypePtr arc, RouteStyleType * style) + ArcType *arc, RouteStyleType * style) { return AddIrregularObstacle (layergroupboxes, arc->BoundingBox.X1, arc->BoundingBox.Y1, @@ -1042,7 +1042,7 @@ CreateRouteData () CONNECTION_LOOP (net); { routebox_t *rb = NULL; - SET_FLAG (DRCFLAG, (PinTypePtr) connection->ptr2); + SET_FLAG (DRCFLAG, (PinType *) connection->ptr2); if (connection->type == LINE_TYPE) { LineType *line = (LineType *) connection->ptr2; @@ -1460,8 +1460,8 @@ bloat_routebox (routebox_t * rb) void showbox (BoxType b, Dimension thickness, int group) { - LineTypePtr line; - LayerTypePtr SLayer = LAYER_PTR (group); + LineType *line; + LayerType *SLayer = LAYER_PTR (group); if (showboxen < -1) return; if (showboxen != -1 && showboxen != group) @@ -4963,7 +4963,7 @@ out: struct fpin_info { - PinTypePtr pin; + PinType *pin; Coord X, Y; jmp_buf env; }; @@ -4971,18 +4971,18 @@ struct fpin_info static int fpin_rect (const BoxType * b, void *cl) { - PinTypePtr pin = (PinTypePtr) b; + PinType *pin = (PinType *) b; struct fpin_info *info = (struct fpin_info *) cl; if (pin->X == info->X && pin->Y == info->Y) { - info->pin = (PinTypePtr) b; + info->pin = (PinType *) b; longjmp (info->env, 1); } return 0; } static int -FindPin (const BoxType * box, PinTypePtr * pin) +FindPin (const BoxType * box, PinType ** pin) { struct fpin_info info; @@ -5014,7 +5014,7 @@ bool IronDownAllUnfixedPaths (routedata_t * rd) { bool changed = false; - LayerTypePtr layer; + LayerType *layer; routebox_t *net, *p; int i; LIST_LOOP (rd->first_net, different_net, net); @@ -5123,7 +5123,7 @@ IronDownAllUnfixedPaths (routedata_t * rd) { if (p->type == THERMAL) { - PinTypePtr pin = NULL; + PinType *pin = NULL; /* thermals are alread a single point search, no need to shrink */ int type = FindPin (&p->box, &pin); if (pin) diff --git a/src/buffer.c b/src/buffer.c index 1f9293a..0394f2f 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -63,28 +63,28 @@ /* --------------------------------------------------------------------------- * some local prototypes */ -static void *AddViaToBuffer (PinTypePtr); -static void *AddLineToBuffer (LayerTypePtr, LineTypePtr); -static void *AddArcToBuffer (LayerTypePtr, ArcTypePtr); -static void *AddRatToBuffer (RatTypePtr); -static void *AddTextToBuffer (LayerTypePtr, TextTypePtr); -static void *AddPolygonToBuffer (LayerTypePtr, PolygonTypePtr); -static void *AddElementToBuffer (ElementTypePtr); -static void *MoveViaToBuffer (PinTypePtr); -static void *MoveLineToBuffer (LayerTypePtr, LineTypePtr); -static void *MoveArcToBuffer (LayerTypePtr, ArcTypePtr); -static void *MoveRatToBuffer (RatTypePtr); -static void *MoveTextToBuffer (LayerTypePtr, TextTypePtr); -static void *MovePolygonToBuffer (LayerTypePtr, PolygonTypePtr); -static void *MoveElementToBuffer (ElementTypePtr); -static void SwapBuffer (BufferTypePtr); +static void *AddViaToBuffer (PinType *); +static void *AddLineToBuffer (LayerType *, LineType *); +static void *AddArcToBuffer (LayerType *, ArcType *); +static void *AddRatToBuffer (RatType *); +static void *AddTextToBuffer (LayerType *, TextType *); +static void *AddPolygonToBuffer (LayerType *, PolygonType *); +static void *AddElementToBuffer (ElementType *); +static void *MoveViaToBuffer (PinType *); +static void *MoveLineToBuffer (LayerType *, LineType *); +static void *MoveArcToBuffer (LayerType *, ArcType *); +static void *MoveRatToBuffer (RatType *); +static void *MoveTextToBuffer (LayerType *, TextType *); +static void *MovePolygonToBuffer (LayerType *, PolygonType *); +static void *MoveElementToBuffer (ElementType *); +static void SwapBuffer (BufferType *); #define ARG(n) (argc > (n) ? argv[n] : 0) /* --------------------------------------------------------------------------- * some local identifiers */ -static DataTypePtr Dest, Source; +static DataType *Dest, *Source; static ObjectFunctionType AddBufferFunctions = { AddLineToBuffer, @@ -115,7 +115,7 @@ static int ExtraFlag = 0; * copies a via to paste buffer */ static void * -AddViaToBuffer (PinTypePtr Via) +AddViaToBuffer (PinType *Via) { return (CreateNewVia (Dest, Via->X, Via->Y, Via->Thickness, Via->Clearance, Via->Mask, Via->DrillingHole, Via->Name, @@ -126,7 +126,7 @@ AddViaToBuffer (PinTypePtr Via) * copies a rat-line to paste buffer */ static void * -AddRatToBuffer (RatTypePtr Rat) +AddRatToBuffer (RatType *Rat) { return (CreateNewRat (Dest, Rat->Point1.X, Rat->Point1.Y, Rat->Point2.X, Rat->Point2.Y, Rat->group1, @@ -138,10 +138,10 @@ AddRatToBuffer (RatTypePtr Rat) * copies a line to buffer */ static void * -AddLineToBuffer (LayerTypePtr Layer, LineTypePtr Line) +AddLineToBuffer (LayerType *Layer, LineType *Line) { - LineTypePtr line; - LayerTypePtr layer = &Dest->Layer[GetLayerNumber (Source, Layer)]; + LineType *line; + LayerType *layer = &Dest->Layer[GetLayerNumber (Source, Layer)]; line = CreateNewLineOnLayer (layer, Line->Point1.X, Line->Point1.Y, Line->Point2.X, Line->Point2.Y, @@ -157,9 +157,9 @@ AddLineToBuffer (LayerTypePtr Layer, LineTypePtr Line) * copies an arc to buffer */ static void * -AddArcToBuffer (LayerTypePtr Layer, ArcTypePtr Arc) +AddArcToBuffer (LayerType *Layer, ArcType *Arc) { - LayerTypePtr layer = &Dest->Layer[GetLayerNumber (Source, Layer)]; + LayerType *layer = &Dest->Layer[GetLayerNumber (Source, Layer)]; return (CreateNewArcOnLayer (layer, Arc->X, Arc->Y, Arc->Width, Arc->Height, Arc->StartAngle, Arc->Delta, @@ -172,9 +172,9 @@ AddArcToBuffer (LayerTypePtr Layer, ArcTypePtr Arc) * copies a text to buffer */ static void * -AddTextToBuffer (LayerTypePtr Layer, TextTypePtr Text) +AddTextToBuffer (LayerType *Layer, TextType *Text) { - LayerTypePtr layer = &Dest->Layer[GetLayerNumber (Source, Layer)]; + LayerType *layer = &Dest->Layer[GetLayerNumber (Source, Layer)]; return (CreateNewText (layer, &PCB->Font, Text->X, Text->Y, Text->Direction, Text->Scale, Text->TextString, @@ -185,10 +185,10 @@ AddTextToBuffer (LayerTypePtr Layer, TextTypePtr Text) * copies a polygon to buffer */ static void * -AddPolygonToBuffer (LayerTypePtr Layer, PolygonTypePtr Polygon) +AddPolygonToBuffer (LayerType *Layer, PolygonType *Polygon) { - LayerTypePtr layer = &Dest->Layer[GetLayerNumber (Source, Layer)]; - PolygonTypePtr polygon; + LayerType *layer = &Dest->Layer[GetLayerNumber (Source, Layer)]; + PolygonType *polygon; polygon = CreateNewPolygon (layer, Polygon->Flags); CopyPolygonLowLevel (polygon, Polygon); @@ -209,9 +209,9 @@ AddPolygonToBuffer (LayerTypePtr Layer, PolygonTypePtr Polygon) * copies a element to buffer */ static void * -AddElementToBuffer (ElementTypePtr Element) +AddElementToBuffer (ElementType *Element) { - ElementTypePtr element; + ElementType *element; element = GetElementMemory (Dest); CopyElementLowLevel (Dest, element, Element, false, 0, 0); @@ -287,7 +287,7 @@ MoveRatToBuffer (RatType *rat) static void * MoveLineToBuffer (LayerType *layer, LineType *line) { - LayerTypePtr lay = &Dest->Layer[GetLayerNumber (Source, layer)]; + LayerType *lay = &Dest->Layer[GetLayerNumber (Source, layer)]; RestoreToPolygon (Source, LINE_TYPE, layer, line); r_delete_entry (layer->line_tree, (BoxType *)line); @@ -428,9 +428,9 @@ MoveElementToBuffer (ElementType *element) * calculates the bounding box of the buffer */ void -SetBufferBoundingBox (BufferTypePtr Buffer) +SetBufferBoundingBox (BufferType *Buffer) { - BoxTypePtr box = GetDataBoundingBox (Buffer->Data); + BoxType *box = GetDataBoundingBox (Buffer->Data); if (box) Buffer->BoundingBox = *box; @@ -440,7 +440,7 @@ SetBufferBoundingBox (BufferTypePtr Buffer) * clears the contents of the paste buffer */ void -ClearBuffer (BufferTypePtr Buffer) +ClearBuffer (BufferType *Buffer) { if (Buffer && Buffer->Data) { @@ -454,7 +454,7 @@ ClearBuffer (BufferTypePtr Buffer) * returns true if any objects have been removed */ void -AddSelectedToBuffer (BufferTypePtr Buffer, Coord X, Coord Y, bool LeaveSelected) +AddSelectedToBuffer (BufferType *Buffer, Coord X, Coord Y, bool LeaveSelected) { /* switch crosshair off because adding objects to the pastebuffer * may change the 'valid' area for the cursor @@ -488,9 +488,9 @@ AddSelectedToBuffer (BufferTypePtr Buffer, Coord X, Coord Y, bool LeaveSelected) * if successful, update some other stuff and reposition the pastebuffer */ bool -LoadElementToBuffer (BufferTypePtr Buffer, char *Name, bool FromFile) +LoadElementToBuffer (BufferType *Buffer, char *Name, bool FromFile) { - ElementTypePtr element; + ElementType *element; ClearBuffer (Buffer); if (FromFile) @@ -716,7 +716,7 @@ search_footprint_hash (const char *footprint) /* Returns zero on success, non-zero on error. */ int -LoadFootprintByName (BufferTypePtr Buffer, char *Footprint) +LoadFootprintByName (BufferType *Buffer, char *Footprint) { int i; FootprintHashEntry *fpe; @@ -816,7 +816,7 @@ LoadFootprint (int argc, char **argv, Coord x, Coord y) char *name = ARG(0); char *refdes = ARG(1); char *value = ARG(2); - ElementTypePtr e; + ElementType *e; if (!name) AFAIL (loadfootprint); @@ -857,11 +8... [truncated message content] |
From: <gi...@gp...> - 2011-12-24 01:52:21
|
The branch, master has been updated via 8e70de4d87dd2bf1979ddf17ce235bb0e2f7d113 (commit) from ff2492399fd4743c3fd89ffd4fe6650ad0d80a4a (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/mymem.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ================= Commit Messages ================= commit 8e70de4d87dd2bf1979ddf17ce235bb0e2f7d113 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> mymem.c: Fix incorrect types passed to sizeof() in a couple of places (Caught by coverity) Coverity-cid: 242 Coverity-cid: 243 Coverity-cid: 244 Coverity-cid: 245 :100644 100644 f7939e7... c79e068... M src/mymem.c ========= Changes ========= commit 8e70de4d87dd2bf1979ddf17ce235bb0e2f7d113 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> mymem.c: Fix incorrect types passed to sizeof() in a couple of places (Caught by coverity) Coverity-cid: 242 Coverity-cid: 243 Coverity-cid: 244 Coverity-cid: 245 diff --git a/src/mymem.c b/src/mymem.c index f7939e7..c79e068 100644 --- a/src/mymem.c +++ b/src/mymem.c @@ -475,10 +475,10 @@ GetDrillElementMemory (DrillTypePtr Drill) { Drill->ElementMax += STEP_ELEMENT; element = (ElementTypePtr *)realloc (element, - Drill->ElementMax * sizeof (ElementTypeHandle)); + Drill->ElementMax * sizeof (ElementTypePtr)); Drill->Element = element; memset (element + Drill->ElementN, 0, - STEP_ELEMENT * sizeof (ElementTypeHandle)); + STEP_ELEMENT * sizeof (ElementTypePtr)); } return (element + Drill->ElementN++); } @@ -497,9 +497,9 @@ GetDrillPinMemory (DrillTypePtr Drill) if (Drill->PinN >= Drill->PinMax) { Drill->PinMax += STEP_POINT; - pin = (PinTypePtr *)realloc (pin, Drill->PinMax * sizeof (PinTypeHandle)); + pin = (PinTypePtr *)realloc (pin, Drill->PinMax * sizeof (PinTypePtr)); Drill->Pin = pin; - memset (pin + Drill->PinN, 0, STEP_POINT * sizeof (PinTypeHandle)); + memset (pin + Drill->PinN, 0, STEP_POINT * sizeof (PinTypePtr)); } return (pin + Drill->PinN++); } |
From: <gi...@gp...> - 2011-12-24 01:41:47
|
The branch, master has been updated via ff2492399fd4743c3fd89ffd4fe6650ad0d80a4a (commit) from 61c26f1310e18f58e20088023cd3e4a6ce3bbe61 (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/djopt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ================= Commit Messages ================= commit ff2492399fd4743c3fd89ffd4fe6650ad0d80a4a Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> djopt.c: Allocate correct size for structure pointer (Caught by coverity) Coverity-cid: 239 :100644 100644 daeae0a... a377508... M src/djopt.c ========= Changes ========= commit ff2492399fd4743c3fd89ffd4fe6650ad0d80a4a Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> djopt.c: Allocate correct size for structure pointer (Caught by coverity) Coverity-cid: 239 diff --git a/src/djopt.c b/src/djopt.c index daeae0a..a377508 100644 --- a/src/djopt.c +++ b/src/djopt.c @@ -1331,7 +1331,7 @@ orthopull_1 (corner_s * c, int fdir, int rdir, int any_sel) if (ln >= lm) { lm = ln + 10; - ls = (line_s **) realloc (ls, lm * sizeof (line_s)); + ls = (line_s **) realloc (ls, lm * sizeof (line_s *)); } ls[ln++] = l; c2 = other_corner (l, c2); |
From: <gi...@gp...> - 2011-12-24 01:36:46
|
The branch, master has been updated via 61c26f1310e18f58e20088023cd3e4a6ce3bbe61 (commit) from ff24fd3c66a2da86b55b2d2c0e2af56cec0d5bde (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/undo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ================= Commit Messages ================= commit 61c26f1310e18f58e20088023cd3e4a6ce3bbe61 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> undo.c: Fix incorrect sizeof() when allocting memory for netlist undo (Caught by coverity) Coverity-cid: 241 :100644 100644 87e02aa... c3fc57e... M src/undo.c ========= Changes ========= commit 61c26f1310e18f58e20088023cd3e4a6ce3bbe61 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> undo.c: Fix incorrect sizeof() when allocting memory for netlist undo (Caught by coverity) Coverity-cid: 241 diff --git a/src/undo.c b/src/undo.c index 87e02aa..c3fc57e 100644 --- a/src/undo.c +++ b/src/undo.c @@ -1646,7 +1646,7 @@ AddNetlistLibToUndoList (LibraryTypePtr lib) undo->Data.NetlistChange.lib = lib; /* and what the old data is that we'll need to restore */ - undo->Data.NetlistChange.old = (LibraryTypePtr)malloc (sizeof (LibraryTypePtr)); + undo->Data.NetlistChange.old = (LibraryTypePtr)malloc (sizeof (LibraryType)); old = undo->Data.NetlistChange.old; old->MenuN = lib->MenuN; old->MenuMax = lib->MenuMax; |
From: <gi...@gp...> - 2011-12-24 01:13:17
|
The branch, master has been updated via ff24fd3c66a2da86b55b2d2c0e2af56cec0d5bde (commit) via 7308f512307158944482227d58e66373fd023d62 (commit) from f7ecf831467068f0ba288a0c136f05768893a826 (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/action.c | 4 ++-- src/mymem.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ================= Commit Messages ================= commit ff24fd3c66a2da86b55b2d2c0e2af56cec0d5bde Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> action.c: Unconditionally notify NetlistChanged() when loading new netlist We need to call NetlistChanged() even if the loading failed, otherwise the GUI is not informed that we free'd the old netlist. :100644 100644 665ae91... b1c33ab... M src/action.c commit 7308f512307158944482227d58e66373fd023d62 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Fix crash upon pressing "f" hotkey (find connected) after a board revert. Reproduction of this crash (before fix!): 1. Load a PCB with a netlist. 2. Open the netlist window to initialise the netlist. 3. File->Revert the PCB 4. Hit "f" key whilst the croshair is over any pad Analysis: When you File->Revert the layout, the GTK GUI's netlist window is not cleared as the old layout is free'd (or as an equivalent cause.. "NetlistChanged(0)" is not called the reverted layout is loaded). Having had the netlist window open before the revert, the data-structures in the GUI are initialised, but point to the pre-revert layout. They are not explicitly updated with a "NetlistChanged" notification, so when the user next hits "f" for find, it will try to use the stale pointers it already had. Fix: Call "NetlistChanged (0);" after free'ing the netlist memory. The "FreeNetlistMemory()" call only free's the individual nets, the parent netlist structure which points to that memory and identifies how many nets are present is zeroed by the FreeNetlistMemory() call, so we can safely call NetlistChanged() at this point, before we have reloaded a new netlist. :100644 100644 2dd10a1... f7939e7... M src/mymem.c ========= Changes ========= commit ff24fd3c66a2da86b55b2d2c0e2af56cec0d5bde Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> action.c: Unconditionally notify NetlistChanged() when loading new netlist We need to call NetlistChanged() even if the loading failed, otherwise the GUI is not informed that we free'd the old netlist. diff --git a/src/action.c b/src/action.c index 665ae91..b1c33ab 100644 --- a/src/action.c +++ b/src/action.c @@ -5852,8 +5852,8 @@ ActionLoadFrom (int argc, char **argv, Coord x, Coord y) free (PCB->Netlistname); PCB->Netlistname = StripWhiteSpaceAndDup (name); FreeLibraryMemory (&PCB->NetlistLib); - if (!ImportNetlist (PCB->Netlistname)) - NetlistChanged (1); + ImportNetlist (PCB->Netlistname); + NetlistChanged (1); } else if (strcasecmp (function, "Revert") == 0 && PCB->Filename && (!PCB->Changed commit 7308f512307158944482227d58e66373fd023d62 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Fix crash upon pressing "f" hotkey (find connected) after a board revert. Reproduction of this crash (before fix!): 1. Load a PCB with a netlist. 2. Open the netlist window to initialise the netlist. 3. File->Revert the PCB 4. Hit "f" key whilst the croshair is over any pad Analysis: When you File->Revert the layout, the GTK GUI's netlist window is not cleared as the old layout is free'd (or as an equivalent cause.. "NetlistChanged(0)" is not called the reverted layout is loaded). Having had the netlist window open before the revert, the data-structures in the GUI are initialised, but point to the pre-revert layout. They are not explicitly updated with a "NetlistChanged" notification, so when the user next hits "f" for find, it will try to use the stale pointers it already had. Fix: Call "NetlistChanged (0);" after free'ing the netlist memory. The "FreeNetlistMemory()" call only free's the individual nets, the parent netlist structure which points to that memory and identifies how many nets are present is zeroed by the FreeNetlistMemory() call, so we can safely call NetlistChanged() at this point, before we have reloaded a new netlist. diff --git a/src/mymem.c b/src/mymem.c index 2dd10a1..f7939e7 100644 --- a/src/mymem.c +++ b/src/mymem.c @@ -677,6 +677,7 @@ FreePCBMemory (PCBType *pcb) for (i = 0; i <= MAX_FONTPOSITION; i++) free (pcb->Font.Symbol[i].Line); FreeLibraryMemory (&pcb->NetlistLib); + NetlistChanged (0); FreeAttributeListMemory (&pcb->Attributes); /* clear struct */ memset (pcb, 0, sizeof (PCBType)); |
From: <gi...@gp...> - 2011-12-24 00:52:49
|
The branch, master has been updated via f7ecf831467068f0ba288a0c136f05768893a826 (commit) from 02a720280796e439015fb0e8257635319ddfaddf (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 ========= doc/pcb.texi | 8 +++----- src/hid/bom/bom.c | 4 ---- tests/golden/hid_bom1/bom_general.bom | 1 - tests/golden/hid_bom1/bom_general.xy | 1 - tests/golden/hid_bom2/bom_general.xy | 1 - tests/golden/hid_bom2/test.bom | 1 - tests/golden/hid_bom3/bom_general.bom | 1 - tests/golden/hid_bom3/test.xy | 1 - tests/golden/hid_bom4/bom_general.bom | 1 - tests/golden/hid_bom4/bom_general.xy | 1 - 10 files changed, 3 insertions(+), 17 deletions(-) ================= Commit Messages ================= commit f7ecf831467068f0ba288a0c136f05768893a826 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove $Id$ lines from bom exporter .xy and .bom output Modern version control systems don't use this kind of expansion, so these lines don't serve much purpose. :100644 100644 db214a2... 0640fe9... M doc/pcb.texi :100644 100644 e67450a... 1835439... M src/hid/bom/bom.c :100644 100644 e069ea1... ee15f7b... M tests/golden/hid_bom1/bom_general.bom :100644 100644 dfcd7de... c391ac2... M tests/golden/hid_bom1/bom_general.xy :100644 100644 c2c9ea2... 56bf534... M tests/golden/hid_bom2/bom_general.xy :100644 100644 c2677f5... 895ee5b... M tests/golden/hid_bom2/test.bom :100644 100644 c2677f5... 895ee5b... M tests/golden/hid_bom3/bom_general.bom :100644 100644 c2c9ea2... 56bf534... M tests/golden/hid_bom3/test.xy :100644 100644 bb246f5... b3cc77f... M tests/golden/hid_bom4/bom_general.bom :100644 100644 fb1350e... 2933983... M tests/golden/hid_bom4/bom_general.xy ========= Changes ========= commit f7ecf831467068f0ba288a0c136f05768893a826 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove $Id$ lines from bom exporter .xy and .bom output Modern version control systems don't use this kind of expansion, so these lines don't serve much purpose. diff --git a/doc/pcb.texi b/doc/pcb.texi index db214a2..0640fe9 100644 --- a/doc/pcb.texi +++ b/doc/pcb.texi @@ -5713,16 +5713,14 @@ R34, but not D34 @section File Format The centroid output file is in a standard comma seperated values (CSV) format. Comment lines begin with a ``#''. The output file contains a -header with an RCS Id tag (useful for those who will check the file -into a version control system), a version number for the file format, -some comments containing the author and title of the board, and a -comment describing the remainder of the file format. +header with a version number for the file format, some comments +containing the author and title of the board, and a comment describing +the remainder of the file format. An example centroid file is shown below. @example -# @verb{ $ }Id@verb{ $ } # PcbXY Version 1.0 # Date: Fri Jul 22 03:40:08 2005 UTC # Author: PCB User diff --git a/src/hid/bom/bom.c b/src/hid/bom/bom.c index e67450a..1835439 100644 --- a/src/hid/bom/bom.c +++ b/src/hid/bom/bom.c @@ -333,8 +333,6 @@ PrintBOM (void) const char *fmt = "%c UTC"; strftime (utcTime, sizeof (utcTime), fmt, gmtime (¤ttime)); } - fprintf (fp, "# $Id"); - fprintf (fp, "$\n"); fprintf (fp, "# PcbXY Version 1.0\n"); fprintf (fp, "# Date: %s\n", utcTime); fprintf (fp, "# Author: %s\n", pcb_author ()); @@ -500,8 +498,6 @@ PrintBOM (void) return 1; } - fprintf (fp, "# $Id"); - fprintf (fp, "$\n"); fprintf (fp, "# PcbBOM Version 1.0\n"); fprintf (fp, "# Date: %s\n", utcTime); fprintf (fp, "# Author: %s\n", pcb_author ()); diff --git a/tests/golden/hid_bom1/bom_general.bom b/tests/golden/hid_bom1/bom_general.bom index e069ea1..ee15f7b 100644 --- a/tests/golden/hid_bom1/bom_general.bom +++ b/tests/golden/hid_bom1/bom_general.bom @@ -1,4 +1,3 @@ -# $Id$ # PcbBOM Version 1.0 # Date: Wed Jun 24 21:42:21 2009 UTC # Author: Dan McMahill diff --git a/tests/golden/hid_bom1/bom_general.xy b/tests/golden/hid_bom1/bom_general.xy index dfcd7de..c391ac2 100644 --- a/tests/golden/hid_bom1/bom_general.xy +++ b/tests/golden/hid_bom1/bom_general.xy @@ -1,4 +1,3 @@ -# $Id$ # PcbXY Version 1.0 # Date: Wed Jun 24 21:42:21 2009 UTC # Author: Dan McMahill diff --git a/tests/golden/hid_bom2/bom_general.xy b/tests/golden/hid_bom2/bom_general.xy index c2c9ea2..56bf534 100644 --- a/tests/golden/hid_bom2/bom_general.xy +++ b/tests/golden/hid_bom2/bom_general.xy @@ -1,4 +1,3 @@ -# $Id$ # PcbXY Version 1.0 # Date: Wed Jun 24 21:42:22 2009 UTC # Author: Dan McMahill diff --git a/tests/golden/hid_bom2/test.bom b/tests/golden/hid_bom2/test.bom index c2677f5..895ee5b 100644 --- a/tests/golden/hid_bom2/test.bom +++ b/tests/golden/hid_bom2/test.bom @@ -1,4 +1,3 @@ -# $Id$ # PcbBOM Version 1.0 # Date: Wed Jun 24 21:42:22 2009 UTC # Author: Dan McMahill diff --git a/tests/golden/hid_bom3/bom_general.bom b/tests/golden/hid_bom3/bom_general.bom index c2677f5..895ee5b 100644 --- a/tests/golden/hid_bom3/bom_general.bom +++ b/tests/golden/hid_bom3/bom_general.bom @@ -1,4 +1,3 @@ -# $Id$ # PcbBOM Version 1.0 # Date: Wed Jun 24 21:42:22 2009 UTC # Author: Dan McMahill diff --git a/tests/golden/hid_bom3/test.xy b/tests/golden/hid_bom3/test.xy index c2c9ea2..56bf534 100644 --- a/tests/golden/hid_bom3/test.xy +++ b/tests/golden/hid_bom3/test.xy @@ -1,4 +1,3 @@ -# $Id$ # PcbXY Version 1.0 # Date: Wed Jun 24 21:42:22 2009 UTC # Author: Dan McMahill diff --git a/tests/golden/hid_bom4/bom_general.bom b/tests/golden/hid_bom4/bom_general.bom index bb246f5..b3cc77f 100644 --- a/tests/golden/hid_bom4/bom_general.bom +++ b/tests/golden/hid_bom4/bom_general.bom @@ -1,4 +1,3 @@ -# $Id$ # PcbBOM Version 1.0 # Date: Wed Jun 24 21:42:23 2009 UTC # Author: Dan McMahill diff --git a/tests/golden/hid_bom4/bom_general.xy b/tests/golden/hid_bom4/bom_general.xy index fb1350e..2933983 100644 --- a/tests/golden/hid_bom4/bom_general.xy +++ b/tests/golden/hid_bom4/bom_general.xy @@ -1,4 +1,3 @@ -# $Id$ # PcbXY Version 1.0 # Date: Wed Jun 24 21:42:23 2009 UTC # Author: Dan McMahill |
From: <gi...@gp...> - 2011-12-24 00:32:24
|
The branch, master has been updated via 02a720280796e439015fb0e8257635319ddfaddf (commit) via 0780f7be39b01e49f229766ed889d3e728827c6d (commit) via ac6a48a434f7443c40f2f11c83c822cb1fadf258 (commit) from 77785825fc7fe8a69401dd5d8f856b4425a6b0f2 (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 ========= Makefile.am | 1 - README.cvs_branches | 3 --- README_FILES/Makefile.am | 3 --- acinclude.m4 | 2 -- autogen.sh | 2 -- doc/ascii2texi.awk | 4 ---- doc/eps2png | 21 +-------------------- doc/extract-docs | 2 -- doc/fractional_size.tab | 3 --- doc/gs/gs.texi | 1 - doc/gs/print-eps.scm | 2 -- doc/ideas/database.txt | 4 ---- doc/ideas/keepouts.txt | 4 ---- doc/letter_size.tab | 3 --- doc/metric_size.tab | 3 --- doc/pcb.texi | 1 - doc/refcard.tex | 1 - doc/wire_size.tab | 3 --- doc/wishlist.txt | 3 --- example/Makefile.am | 2 -- example/libraries/Makefile.am | 2 -- example/libraries/example.inc | 1 - example/libraries/example.m4 | 1 - globalconst.h | 1 - lib/CreateLibrary.sh.in | 1 - lib/CreateLibraryContents.sh.in | 1 - lib/ListLibraryContents.sh.in | 1 - lib/QueryLibrary.sh.in | 1 - lib/TTL_74xx_DIL.list | 1 - lib/TTL_74xx_DIL.m4 | 1 - lib/amp.inc | 1 - lib/amphenol.inc | 1 - lib/amphenol.list | 1 - lib/amphenol.m4 | 1 - lib/bourns.inc | 1 - lib/candk.inc | 1 - lib/common.m4 | 1 - lib/connector.inc | 1 - lib/connector.list | 1 - lib/connector.m4 | 1 - lib/crystal.list | 1 - lib/crystal.m4 | 1 - lib/cts.inc | 1 - lib/dil.inc | 1 - lib/geda.inc | 1 - lib/gen_geda_list.awk | 2 -- lib/gen_geda_m4.awk | 2 -- lib/gen_list.awk | 2 -- lib/gen_m4.awk | 2 -- lib/generic.list | 1 - lib/generic.m4 | 1 - lib/jerry.list | 1 - lib/jerry.m4 | 2 -- lib/johnstech.inc | 1 - lib/linear.list | 1 - lib/linear.m4 | 1 - lib/logic.list | 1 - lib/logic.m4 | 1 - lib/lsi.list | 1 - lib/lsi.m4 | 1 - lib/m4lib_to_newlib.sh | 3 --- lib/memory.list | 1 - lib/memory.m4 | 1 - lib/minicircuits.inc | 1 - lib/misc.inc | 1 - lib/nichicon.inc | 1 - lib/optek.inc | 1 - lib/optical.list | 1 - lib/optical.m4 | 1 - lib/panasonic.inc | 1 - lib/pci.inc | 2 -- lib/pci.list | 3 --- lib/pci.m4 | 1 - lib/plcc.inc | 1 - lib/png_diff.sh | 2 -- lib/qfn.inc | 1 - lib/qfp-ui.in | 1 - lib/qfp.inc | 1 - lib/qfp2.inc | 1 - lib/qfpdj.inc | 1 - lib/resistor_0.25W.list | 1 - lib/resistor_0.25W.m4 | 1 - lib/resistor_adjust.list | 1 - lib/resistor_adjust.m4 | 1 - lib/resistor_array.list | 1 - lib/resistor_array.m4 | 1 - lib/rules.inc | 1 - lib/smt.inc | 1 - lib/texas_inst_amplifier.list | 1 - lib/texas_inst_amplifier.m4 | 1 - lib/texas_inst_voltage_reg.list | 1 - lib/texas_inst_voltage_reg.m4 | 1 - lib/transistor.list | 1 - lib/transistor.m4 | 1 - newlib/2_pin_thru-hole_packages/Makefile.am | 3 --- newlib/Makefile.am | 2 -- newlib/connectors/Makefile.am | 3 --- newlib/crystal/Makefile.am | 3 --- newlib/electro-optics/Makefile.am | 3 --- newlib/headers/Makefile.am | 3 --- newlib/keystone/Makefile.am | 3 --- newlib/msp430/Makefile.am | 3 --- newlib/not_vetted_ingo/Makefile.am | 3 --- newlib/sockets/Makefile.am | 3 --- newlib/tests/Makefile.am | 3 --- src/Makefile.am | 2 -- src/action.c | 2 -- src/action.h | 1 - src/autoplace.c | 4 ---- src/autoplace.h | 2 -- src/autoroute.c | 4 ---- src/autoroute.h | 2 -- src/box.h | 2 -- src/buffer.c | 4 ---- src/buffer.h | 1 - src/change.c | 4 ---- src/change.h | 1 - src/clip.c | 4 ---- src/clip.h | 1 - src/command.c | 4 ---- src/command.h | 1 - src/compat.c | 4 ---- src/compat.h | 2 -- src/const.h | 1 - src/copy.c | 4 ---- src/copy.h | 1 - src/create.c | 4 ---- src/create.h | 1 - src/crosshair.c | 5 ----- src/crosshair.h | 1 - src/data.c | 4 ---- src/data.h | 1 - src/djopt.c | 4 ---- src/djopt.h | 2 -- src/dolists.h | 2 -- src/draw.c | 4 ---- src/draw.h | 1 - src/drill.c | 7 ------- src/drill.h | 2 -- src/error.c | 5 ----- src/error.h | 1 - src/file.c | 4 ---- src/find.c | 7 ------- src/find.h | 1 - src/flags.c | 4 ---- src/fontmode.c | 4 ---- src/gather-actions | 1 - src/global.h | 4 ---- src/heap.c | 5 ----- src/heap.h | 2 -- src/hid/batch/batch.c | 4 ---- src/hid/bom/bom.c | 4 ---- src/hid/common/actions.c | 4 ---- src/hid/common/extents.c | 4 ---- src/hid/common/flags.c | 4 ---- src/hid/common/hidinit.c | 4 ---- src/hid/common/hidnogui.c | 4 ---- src/hid/gcode/curve.c | 2 +- src/hid/gcode/decompose.c | 2 +- src/hid/gcode/decompose.h | 2 +- src/hid/gcode/gcode.h | 2 -- src/hid/gcode/lists.h | 2 +- src/hid/gcode/trace.c | 2 +- src/hid/gcode/trace.h | 2 +- src/hid/gerber/gerber.c | 4 ---- src/hid/gtk/gtkhid-gdk.c | 6 ------ src/hid/gtk/gtkhid-gl.c | 5 ----- src/hid/gtk/gtkhid-main.c | 6 ------ src/hid/gtk/gtkhid.h | 2 -- src/hid/gtk/gui-command-window.c | 4 ---- src/hid/gtk/gui-config.c | 5 ----- src/hid/gtk/gui-dialog-print.c | 4 ---- src/hid/gtk/gui-dialog.c | 4 ---- src/hid/gtk/gui-drc-window.c | 4 ---- src/hid/gtk/gui-drc-window.h | 2 -- src/hid/gtk/gui-icons-misc.data | 1 - src/hid/gtk/gui-icons-mode-buttons.data | 2 -- src/hid/gtk/gui-keyref-window.c | 4 ---- src/hid/gtk/gui-library-window.c | 4 ---- src/hid/gtk/gui-log-window.c | 4 ---- src/hid/gtk/gui-misc.c | 4 ---- src/hid/gtk/gui-netlist-window.c | 4 ---- src/hid/gtk/gui-pinout-preview.c | 4 ---- src/hid/gtk/gui-pinout-preview.h | 2 -- src/hid/gtk/gui-pinout-window.c | 5 ----- src/hid/gtk/gui-top-window.c | 4 ---- src/hid/gtk/gui-utils.c | 4 ---- src/hid/gtk/gui.h | 2 -- src/hid/hidint.h | 2 -- src/hid/lesstif/dialogs.c | 4 ---- src/hid/lesstif/lesstif.h | 2 -- src/hid/lesstif/library.c | 4 ---- src/hid/lesstif/main.c | 5 ----- src/hid/lesstif/menu.c | 4 ---- src/hid/lesstif/netlist.c | 4 ---- src/hid/lesstif/styles.c | 4 ---- src/hid/lesstif/xincludes.h | 2 -- src/hid/lpr/lpr.c | 4 ---- src/hid/nelma/nelma.c | 2 -- src/hid/png/png.h | 2 -- src/hid/ps/eps.c | 4 ---- src/hid/ps/ps.c | 4 ---- src/hid/ps/ps.h | 2 -- src/icon.data | 1 - src/icons/Makefile.am | 2 -- src/insert.c | 7 ------- src/insert.h | 1 - src/intersect.c | 5 ----- src/intersect.h | 2 -- src/line.c | 4 ---- src/line.h | 1 - src/macro.h | 1 - src/main.c | 5 ----- src/mirror.c | 7 ------- src/mirror.h | 1 - src/misc.c | 5 ----- src/misc.h | 1 - src/mode_icon.data | 1 - src/move.c | 7 ------- src/move.h | 1 - src/mtspace.c | 4 ---- src/mtspace.h | 2 -- src/mymem.c | 4 ---- src/mymem.h | 1 - src/netlist.c | 4 ---- src/parse_l.h | 1 - src/parse_l.l | 5 ----- src/parse_y.y | 3 --- src/pcbtest.sh.in | 3 --- src/polygon.h | 1 - src/print.c | 4 ---- src/print.h | 1 - src/puller.c | 4 ---- src/rats.c | 5 ----- src/rats.h | 1 - src/remove.c | 5 ----- src/remove.h | 1 - src/report.h | 1 - src/res_lex.l | 4 ---- src/res_parse.y | 5 ----- src/resource.h | 2 -- src/rotate.c | 7 ------- src/rotate.h | 1 - src/rtree.c | 5 ----- src/rtree.h | 2 -- src/rubberband.c | 5 ----- src/rubberband.h | 1 - src/search.c | 5 ----- src/search.h | 1 - src/select.c | 4 ---- src/select.h | 1 - src/set.c | 4 ---- src/set.h | 1 - src/strflags.c | 3 --- src/strflags.h | 1 - src/thermal.c | 4 ---- src/thermal.h | 1 - src/undo.c | 4 ---- src/undo.h | 1 - src/vector.c | 4 ---- src/vector.h | 2 -- src/vendor.c | 4 ---- src/vendor.h | 2 -- tests/run_tests.sh | 3 --- tools/Makefile.am | 3 --- tools/MergePCBPS | 2 -- tools/Merge_dimPCBPS | 2 -- tutorial/Makefile.am | 2 -- 268 files changed, 7 insertions(+), 675 deletions(-) ================= Commit Messages ================= commit 02a720280796e439015fb0e8257635319ddfaddf Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove remaining RCS $Id$ identifiers left over from our CVS days (Including a couple of $Id magic strings from files we got from potrace, which are used by the gcode exporter). :100644 100644 c6927f1... 6f9a94d... M Makefile.am :100644 100644 41bf60a... 00c025f... M README.cvs_branches :100644 100644 ca74b2d... 78f0801... M README_FILES/Makefile.am :100644 100644 9ab3758... dab11df... M acinclude.m4 :100755 100755 166a3d0... 0de878c... M autogen.sh :100755 100755 fd0e415... b8e3a72... M doc/ascii2texi.awk :100755 100755 d235dc4... 893b7a3... M doc/eps2png :100755 100755 a25de8e... 1d0759e... M doc/extract-docs :100644 100644 eb68f6f... 2687519... M doc/fractional_size.tab :100644 100644 b3cda3f... 744642d... M doc/gs/gs.texi :100644 100644 427267d... 4538610... M doc/gs/print-eps.scm :100644 100644 380d1c9... d69139b... M doc/ideas/database.txt :100644 100644 741d696... abfb483... M doc/ideas/keepouts.txt :100644 100644 9d7459c... 29b633b... M doc/letter_size.tab :100644 100644 3db5222... cfa464e... M doc/metric_size.tab :100644 100644 850b748... db214a2... M doc/pcb.texi :100644 100644 8072351... a735e1c... M doc/refcard.tex :100644 100644 d72997f... 8f57752... M doc/wire_size.tab :100644 100644 e462abe... 737a06d... M doc/wishlist.txt :100644 100644 9f7b034... 6a14876... M example/Makefile.am :100644 100644 21392aa... 9a33712... M example/libraries/Makefile.am :100644 100644 2ee0ec6... 32c43b4... M example/libraries/example.inc :100644 100644 2253a3c... ff2641d... M example/libraries/example.m4 :100755 100755 afba0d4... e0779d5... M globalconst.h :100755 100755 13ffa5e... 6dd4f39... M lib/CreateLibrary.sh.in :100755 100755 ccba4a3... 8f38224... M lib/CreateLibraryContents.sh.in :100755 100755 cee49df... 9e453b7... M lib/ListLibraryContents.sh.in :100755 100755 b5bed20... f053ced... M lib/QueryLibrary.sh.in :100755 100755 e51b4bc... 7fbaac4... M lib/TTL_74xx_DIL.list :100755 100755 df52b7f... ca3fe0f... M lib/TTL_74xx_DIL.m4 :100644 100644 cca93b9... e1fcf55... M lib/amp.inc :100755 100755 e41f874... b88ed39... M lib/amphenol.inc :100755 100755 1393b15... d2690d2... M lib/amphenol.list :100755 100755 fb499cf... c2c4f3c... M lib/amphenol.m4 :100644 100644 0ebc298... 23eee32... M lib/bourns.inc :100644 100644 94e59b9... 6ad6072... M lib/candk.inc :100644 100644 bc619c8... 4c1f494... M lib/common.m4 :100755 100755 3bd8195... 689f204... M lib/connector.inc :100755 100755 d38e622... 0af58a8... M lib/connector.list :100755 100755 a264c19... ae1575c... M lib/connector.m4 :100755 100755 ad9c265... da0c7b4... M lib/crystal.list :100755 100755 bf2979d... cf7e4b2... M lib/crystal.m4 :100644 100644 cf0b648... e1f281c... M lib/cts.inc :100755 100755 d1cde4a... 6a75e0a... M lib/dil.inc :100644 100644 d25dd1d... 985c18a... M lib/geda.inc :100755 100755 0770b47... fc73e5a... M lib/gen_geda_list.awk :100755 100755 88994de... ccbf4d8... M lib/gen_geda_m4.awk :100755 100755 5a9e8cd... b3d672e... M lib/gen_list.awk :100755 100755 2b16867... 544f686... M lib/gen_m4.awk :100755 100755 bc31768... 2fc70ab... M lib/generic.list :100755 100755 cd19fcd... a08cac0... M lib/generic.m4 :100644 100644 903e853... 6d03af9... M lib/jerry.list :100644 100644 f3f742c... 28dd30f... M lib/jerry.m4 :100644 100644 926a3ad... 0a11fee... M lib/johnstech.inc :100755 100755 80eabe3... ab120fd... M lib/linear.list :100755 100755 ba01501... 5b8e695... M lib/linear.m4 :100755 100755 8777e57... 9f59eb5... M lib/logic.list :100755 100755 517767a... 15a2cb1... M lib/logic.m4 :100755 100755 d805435... b98afdf... M lib/lsi.list :100755 100755 c495f90... 99dd15c... M lib/lsi.m4 :100644 100644 09499b6... 6ca4b81... M lib/m4lib_to_newlib.sh :100755 100755 00e7b88... ed58e7f... M lib/memory.list :100755 100755 8bdceeb... 7af73fb... M lib/memory.m4 :100644 100644 22174a5... 9ec6218... M lib/minicircuits.inc :100755 100755 380d511... f34a3fc... M lib/misc.inc :100644 100644 545e1d4... f96c151... M lib/nichicon.inc :100644 100644 943f0c4... 711ecde... M lib/optek.inc :100755 100755 8fa292b... 1a78dfb... M lib/optical.list :100755 100755 92b6a17... 24a7f52... M lib/optical.m4 :100644 100644 5c3b85a... b539cd6... M lib/panasonic.inc :100644 100644 762749e... 23d9189... M lib/pci.inc :100644 100644 0ddcb59... 44f9fbd... M lib/pci.list :100644 100644 632ec7d... 4dfa176... M lib/pci.m4 :100755 100755 5e1a1dc... cbe7458... M lib/plcc.inc :100755 100755 478c19c... ee557fd... M lib/png_diff.sh :100644 100644 d8fb50f... 5710cc6... M lib/qfn.inc :100755 100755 f6261a1... fe0b8d0... M lib/qfp-ui.in :100644 100644 0ceaeed... a0598d4... M lib/qfp.inc :100644 100644 04f6aa2... 130f237... M lib/qfp2.inc :100644 100644 51e30b1... 98c5d5b... M lib/qfpdj.inc :100755 100755 3c68234... 71e27dc... M lib/resistor_0.25W.list :100755 100755 3487ab6... b83a624... M lib/resistor_0.25W.m4 :100644 100644 a211622... b6d2657... M lib/resistor_adjust.list :100644 100644 ec13611... 10def9f... M lib/resistor_adjust.m4 :100755 100755 f659ba8... 32ed7af... M lib/resistor_array.list :100755 100755 bdf96e0... a939410... M lib/resistor_array.m4 :100644 100644 aee42f9... 244e592... M lib/rules.inc :100644 100644 ace76a0... eba644a... M lib/smt.inc :100755 100755 531aaad... 4776a48... M lib/texas_inst_amplifier.list :100755 100755 01c2ea5... 47572f1... M lib/texas_inst_amplifier.m4 :100644 100644 862cea9... 100e641... M lib/texas_inst_voltage_reg.list :100644 100644 a6fdb2f... 5a1052c... M lib/texas_inst_voltage_reg.m4 :100755 100755 2e7d339... f814079... M lib/transistor.list :100755 100755 fa33af6... fa112fe... M lib/transistor.m4 :100644 100644 18f59ed... bc67252... M newlib/2_pin_thru-hole_packages/Makefile.am :100644 100644 e38b946... da5dc95... M newlib/Makefile.am :100644 100644 b1d56c8... b261d4d... M newlib/connectors/Makefile.am :100644 100644 a45bf12... f91a2d2... M newlib/crystal/Makefile.am :100644 100644 5003ae8... c84c7fd... M newlib/electro-optics/Makefile.am :100644 100644 6a196bf... b543e09... M newlib/headers/Makefile.am :100644 100644 295f064... e0cde83... M newlib/keystone/Makefile.am :100644 100644 ae9ac11... 08471b2... M newlib/msp430/Makefile.am :100644 100644 580e9c8... 1b8f3fe... M newlib/not_vetted_ingo/Makefile.am :100644 100644 5cf859f... 15b4e57... M newlib/sockets/Makefile.am :100644 100644 0be6654... 356d9ba... M newlib/tests/Makefile.am :100644 100644 7adb424... 47035f6... M src/Makefile.am :100644 100644 83089f3... 4b93ef8... M src/action.h :100644 100644 0e74b66... e7cdee8... M src/autoplace.c :100644 100644 5133cf0... 75e4c8f... M src/autoplace.h :100644 100644 34e01dc... 374b6ac... M src/autoroute.c :100644 100644 d659349... 256a495... M src/autoroute.h :100644 100644 1c8311a... 943b316... M src/box.h :100644 100644 ac2aa54... 1f9293a... M src/buffer.c :100644 100644 e589fd4... 6871216... M src/buffer.h :100644 100644 61cb335... aaad7a2... M src/change.c :100644 100644 64c44ff... 3fd896d... M src/change.h :100644 100644 f38c660... e4fef34... M src/clip.c :100644 100644 c06d64f... aaec5a8... M src/clip.h :100644 100644 963ed85... 8055ec8... M src/command.c :100644 100644 5517993... 5018f28... M src/command.h :100644 100644 e3acf2f... 6092764... M src/compat.c :100644 100644 9afa02c... ff83161... M src/compat.h :100644 100644 078f83f... 7d732e8... M src/const.h :100644 100644 29ac62f... 193bb52... M src/copy.c :100644 100644 e65c272... af0b7ff... M src/copy.h :100644 100644 8d8344c... 8a1effd... M src/create.c :100644 100644 ccab272... faebe52... M src/create.h :100644 100644 177c9cc... 055f390... M src/crosshair.c :100644 100644 8c42067... 2dd5e7e... M src/crosshair.h :100644 100644 ebd9b29... 702d9ca... M src/data.c :100644 100644 502acdd... efb2ed1... M src/data.h :100644 100644 7b5a223... daeae0a... M src/djopt.c :100644 100644 bc337af... 15014c1... M src/djopt.h :100644 100644 d16f055... 3b7c663... M src/dolists.h :100644 100644 a06dde1... a11c6e2... M src/draw.c :100644 100644 d92dee5... cc0822f... M src/draw.h :100644 100644 a7a908b... efa9baa... M src/drill.c :100644 100644 862ff08... f155a72... M src/drill.h :100644 100644 f01420e... 4e802a4... M src/error.c :100644 100644 8409767... 8cd99a2... M src/error.h :100644 100644 92e719b... c157659... M src/file.c :100644 100644 cd2aff5... fa03ba7... M src/find.c :100644 100644 d2be7ac... 1d54111... M src/find.h :100644 100644 de77b68... d809ad5... M src/flags.c :100644 100644 dd64f63... f218e7c... M src/fontmode.c :100644 100644 f024158... d8b9e9d... M src/gather-actions :100644 100644 029d63c... 79c1456... M src/global.h :100644 100644 57a8208... 50b11c0... M src/heap.c :100644 100644 381c7b2... 85e6a53... M src/heap.h :100644 100644 ca8caf0... 8b969fa... M src/hid/batch/batch.c :100644 100644 b3529cd... e67450a... M src/hid/bom/bom.c :100644 100644 13bb129... abd86ae... M src/hid/common/actions.c :100644 100644 6cdc135... d970c77... M src/hid/common/extents.c :100644 100644 92032f9... 9c87a54... M src/hid/common/flags.c :100644 100644 3695f7d... 9f05800... M src/hid/common/hidinit.c :100644 100644 b08d90d... d772e18... M src/hid/common/hidnogui.c :100644 100644 abf85d7... 24b927c... M src/hid/gcode/curve.c :100644 100644 0b42882... eeac028... M src/hid/gcode/decompose.c :100644 100644 333003e... 9c11429... M src/hid/gcode/decompose.h :100644 100644 ae9d7a0... e0db890... M src/hid/gcode/gcode.h :100644 100644 3513184... 60d42e6... M src/hid/gcode/lists.h :100644 100644 5d7c62e... 9a3f743... M src/hid/gcode/trace.c :100644 100644 d55fd3e... ead6d50... M src/hid/gcode/trace.h :100644 100644 3973814... dd9c1c9... M src/hid/gerber/gerber.c :100644 100644 9f4250d... 8e6cf22... M src/hid/gtk/gtkhid-gdk.c :100644 100644 d372f8a... 7471afc... M src/hid/gtk/gtkhid-gl.c :100644 100644 cc474cd... d8bf02c... M src/hid/gtk/gtkhid-main.c :100644 100644 f55845b... d6e9887... M src/hid/gtk/gtkhid.h :100644 100644 d913cae... 25b0154... M src/hid/gtk/gui-command-window.c :100644 100644 2a4fcd8... 03fa15b... M src/hid/gtk/gui-config.c :100644 100644 5d7d003... b418688... M src/hid/gtk/gui-dialog-print.c :100644 100644 1770bba... 87ee906... M src/hid/gtk/gui-dialog.c :100644 100644 ce0210c... 9cbc955... M src/hid/gtk/gui-drc-window.c :100644 100644 8b3558a... 367cb8f... M src/hid/gtk/gui-drc-window.h :100644 100644 0d121b9... f0d2ec7... M src/hid/gtk/gui-icons-misc.data :100644 100644 be040f1... 19e9ce8... M src/hid/gtk/gui-icons-mode-buttons.data :100644 100644 6eaf3eb... e2632ca... M src/hid/gtk/gui-keyref-window.c :100644 100644 96b5f1f... 1d22dd4... M src/hid/gtk/gui-library-window.c :100644 100644 01daaee... 46413c1... M src/hid/gtk/gui-log-window.c :100644 100644 e84b276... bf3b79e... M src/hid/gtk/gui-misc.c :100644 100644 a847e6d... 51192c6... M src/hid/gtk/gui-netlist-window.c :100644 100644 79fc0f2... 3336945... M src/hid/gtk/gui-pinout-preview.c :100644 100644 77fdd1b... 1f21e80... M src/hid/gtk/gui-pinout-preview.h :100644 100644 6433fb1... ea6e8bb... M src/hid/gtk/gui-pinout-window.c :100644 100644 e876220... 2335a74... M src/hid/gtk/gui-top-window.c :100644 100644 0fcb5d2... f776f5c... M src/hid/gtk/gui-utils.c :100644 100644 ea49bee... 788553e... M src/hid/gtk/gui.h :100644 100644 b986f78... 8d62d6b... M src/hid/hidint.h :100644 100644 5d744f9... 59a44c8... M src/hid/lesstif/dialogs.c :100644 100644 235bf57... ccbe89b... M src/hid/lesstif/lesstif.h :100644 100644 029a023... 3c8d7d7... M src/hid/lesstif/library.c :100644 100644 c625fc2... f6d3098... M src/hid/lesstif/main.c :100644 100644 8c71c61... d761ce5... M src/hid/lesstif/menu.c :100644 100644 ce28539... 572fba1... M src/hid/lesstif/netlist.c :100644 100644 5ec19d8... 824b7f3... M src/hid/lesstif/styles.c :100644 100644 af1314c... d8e7b09... M src/hid/lesstif/xincludes.h :100644 100644 fc9403b... a03b19c... M src/hid/lpr/lpr.c :100644 100644 9e75927... fd0aa11... M src/hid/nelma/nelma.c :100644 100644 e528753... bdd06e1... M src/hid/png/png.h :100644 100644 a406f38... ba27023... M src/hid/ps/eps.c :100644 100644 6ecbc64... 263a240... M src/hid/ps/ps.c :100644 100644 661eaa8... a6ea013... M src/hid/ps/ps.h :100644 100644 7e55e93... 470b2c8... M src/icon.data :100644 100644 23cc5a4... f2c29ff... M src/icons/Makefile.am :100644 100644 42661ec... 7e12874... M src/insert.c :100644 100644 0476e8d... 2793edf... M src/insert.h :100644 100644 a3ee03f... 33b359d... M src/intersect.c :100644 100644 2c1e7f5... 7ed758e... M src/intersect.h :100644 100644 22efc2b... 6846b2d... M src/line.c :100644 100644 82db33a... 8a5e4d2... M src/line.h :100644 100644 025351f... 59c53ba... M src/macro.h :100644 100644 48e825c... e170f5a... M src/main.c :100644 100644 c48ebf3... 54c53cb... M src/mirror.c :100644 100644 da61744... 50f648a... M src/mirror.h :100644 100644 3cc04a0... 13ce8f6... M src/misc.c :100644 100644 a0220c0... 2f34cfe... M src/misc.h :100644 100644 e88866e... 40e587e... M src/mode_icon.data :100644 100644 56ced53... f1971d5... M src/move.c :100644 100644 3daec3d... 801a5cc... M src/move.h :100644 100644 a4bb314... 8bb3a8c... M src/mtspace.c :100644 100644 c169170... baf368f... M src/mtspace.h :100644 100644 73b3ef7... 2dd10a1... M src/mymem.c :100644 100644 a66e349... 88c5628... M src/mymem.h :100644 100644 06f0e77... f467f52... M src/netlist.c :100644 100644 eb01528... dfeed70... M src/parse_l.h :100644 100644 33a115d... c0ec6a7... M src/parse_l.l :100644 100644 8cf1888... adc2387... M src/parse_y.y :100755 100755 e1e97b2... 516a526... M src/pcbtest.sh.in :100644 100644 bdbef46... e5d1ace... M src/polygon.h :100644 100644 4c01721... 6d984a6... M src/print.c :100644 100644 2215aea... 85943f3... M src/print.h :100644 100644 959ac54... 90f082a... M src/puller.c :100644 100644 d2aa8bb... fc6948f... M src/rats.c :100644 100644 9479fe0... 16e5338... M src/rats.h :100644 100644 4554597... d38805f... M src/remove.c :100644 100644 1fc8890... 9066428... M src/remove.h :100644 100644 6d0184e... c995cde... M src/report.h :100644 100644 5e08666... dd4dadd... M src/res_lex.l :100644 100644 efc44a0... 97c1aae... M src/res_parse.y :100644 100644 119d615... 9385e6a... M src/resource.h :100644 100644 1763406... 99f379d... M src/rotate.c :100644 100644 7748b19... 2ac060e... M src/rotate.h :100644 100644 680be3d... 6558427... M src/rtree.c :100644 100644 cb23307... d44de09... M src/rtree.h :100644 100644 4fe166c... f5f7442... M src/rubberband.c :100644 100644 9e671bf... e281f3f... M src/rubberband.h :100644 100644 5417462... 29271f0... M src/search.c :100644 100644 b1a6196... 30553dd... M src/search.h :100644 100644 96db234... 31ea28d... M src/select.c :100644 100644 f3edde6... 6d91278... M src/select.h :100644 100644 18fffa7... 21351da... M src/set.c :100644 100644 4bfe6ec... d3b9a1f... M src/set.h :100644 100644 8f4912c... 3699c53... M src/strflags.c :100644 100644 da16b64... a5f5b44... M src/strflags.h :100644 100644 03fee24... d2cfa95... M src/thermal.c :100644 100644 67c04e0... b252f4f... M src/thermal.h :100644 100644 17bebb9... 87e02aa... M src/undo.c :100644 100644 a6cd324... 2ec6442... M src/undo.h :100644 100644 c039b89... aad1c62... M src/vector.c :100644 100644 344118d... b6b6de1... M src/vector.h :100644 100644 2abcca0... f7b89f7... M src/vendor.c :100644 100644 aba4148... 9706448... M src/vendor.h :100755 100755 5bd4acb... b24bc65... M tests/run_tests.sh :100644 100644 f350471... 3900614... M tools/Makefile.am :100755 100755 8785d28... 8d63529... M tools/MergePCBPS :100755 100755 08c559e... 84ce3ab... M tools/Merge_dimPCBPS :100644 100644 85daeac... 2b9320f... M tutorial/Makefile.am commit 0780f7be39b01e49f229766ed889d3e728827c6d Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> doc/eps2png: Remove version information from this utility This is obsolete since we switched from CVS, and refers to something called "Sciurix" (perhaps where we got this code from). Remove it for clarity. Also remove the -ident command line option, which we don't use, and refers to the above removed version information. :100755 100755 c029991... d235dc4... M doc/eps2png commit ac6a48a434f7443c40f2f11c83c822cb1fadf258 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove change log like comments from file headers We use git to track changes, not individual file headers. :100644 100644 69bf89d... 665ae91... M src/action.c :100644 100644 a644cc7... 177c9cc... M src/crosshair.c :100644 100644 8896901... 029d63c... M src/global.h :100644 100644 a4b34ee... c625fc2... M src/hid/lesstif/main.c ========= Changes ========= commit 02a720280796e439015fb0e8257635319ddfaddf Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove remaining RCS $Id$ identifiers left over from our CVS days (Including a couple of $Id magic strings from files we got from potrace, which are used by the gcode exporter). diff --git a/Makefile.am b/Makefile.am index c6927f1..6f9a94d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,4 @@ ## -*- makefile -*- -## $Id$ ## ## Top level automake file for PCB diff --git a/README.cvs_branches b/README.cvs_branches index 41bf60a..00c025f 100644 --- a/README.cvs_branches +++ b/README.cvs_branches @@ -1,6 +1,3 @@ -# $Id$ -# - usermenu - cvs branch where Dan is working on allowing the gtk HID to load its menus from a menu resource file like the lesstif HID. No guarantees that this branch will even build, much less diff --git a/README_FILES/Makefile.am b/README_FILES/Makefile.am index ca74b2d..78f0801 100644 --- a/README_FILES/Makefile.am +++ b/README_FILES/Makefile.am @@ -1,6 +1,3 @@ -## $Id$ -## - EXTRA_DIST= \ CHANGES \ Tools \ diff --git a/acinclude.m4 b/acinclude.m4 index 9ab3758..dab11df 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,5 +1,3 @@ -dnl $Id$ -dnl dnl the FC_* macros were copied from the freeciv program. The use here dnl is to figure out if we need -DNARROWPROTO and the correct setting dnl for FUNCPROTO. Without these set right, it has been observed that diff --git a/autogen.sh b/autogen.sh index 166a3d0..0de878c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,7 +1,5 @@ #! /bin/sh # -# $Id$ -# # Run the various GNU autotools to bootstrap the build # system. Should only need to be done once. diff --git a/doc/ascii2texi.awk b/doc/ascii2texi.awk index fd0e415..b8e3a72 100755 --- a/doc/ascii2texi.awk +++ b/doc/ascii2texi.awk @@ -1,7 +1,4 @@ #!/usr/bin/awk -f -# -# $Id$ -# BEGIN { first = 1; @@ -23,7 +20,6 @@ BEGIN { first == 1 { first = 0; printf("@c Generated file. Do not edit directly\n"); - printf("@c $" "Id" "$\n"); printf("@multitable @columnfractions "); for(i = 1 ; i <= 2*ncol ; i = i + 1) { printf("%.3g ", 0.5 / ncol); diff --git a/doc/eps2png b/doc/eps2png index d235dc4..893b7a3 100755 --- a/doc/eps2png +++ b/doc/eps2png @@ -1,7 +1,5 @@ #!/usr/bin/perl -my $RCS_Id = '$Id$ '; - # Author : Johan Vromans # Created On : Tue Sep 15 15:59:04 1992 # Last Modified By: Johan Vromans diff --git a/doc/extract-docs b/doc/extract-docs index a25de8e..1d0759e 100755 --- a/doc/extract-docs +++ b/doc/extract-docs @@ -1,8 +1,6 @@ #!/usr/bin/perl # -*- perl -*- # -# $Id$ -# ################################################################# # This script extracts special comments from the source. It assembles # them in texinfo files that are included in the manual. diff --git a/doc/fractional_size.tab b/doc/fractional_size.tab index eb68f6f..2687519 100644 --- a/doc/fractional_size.tab +++ b/doc/fractional_size.tab @@ -1,6 +1,3 @@ -# $Id$ -# - 1/64 .0156 1/32 .0313 3/64 .0469 diff --git a/doc/gs/gs.texi b/doc/gs/gs.texi index b3cda3f..744642d 100644 --- a/doc/gs/gs.texi +++ b/doc/gs/gs.texi @@ -1,5 +1,4 @@ \input texinfo @c -*-texinfo-*- -@comment RCS: $Id$ @comment %**start of header @setfilename gs.info @settitle Getting Started With PCB diff --git a/doc/gs/print-eps.scm b/doc/gs/print-eps.scm index 427267d..4538610 100644 --- a/doc/gs/print-eps.scm +++ b/doc/gs/print-eps.scm @@ -1,5 +1,3 @@ -;; $Id$ -;; ;; This file may be used to print gschem schematics from the ;; command line. Typical usage is: ;; diff --git a/doc/ideas/database.txt b/doc/ideas/database.txt index 380d1c9..d69139b 100644 --- a/doc/ideas/database.txt +++ b/doc/ideas/database.txt @@ -1,7 +1,3 @@ -# $Id$ -# -# - Please note that this document is a work in progress and currently represents a proposal for a future enhancement. The goal of this document is to define what changes need diff --git a/doc/ideas/keepouts.txt b/doc/ideas/keepouts.txt index 741d696..abfb483 100644 --- a/doc/ideas/keepouts.txt +++ b/doc/ideas/keepouts.txt @@ -1,7 +1,3 @@ -# $Id$ -# -# - Please note that this document is a work in progress and currently represents a proposal for a future enhancement. The goal of this document is to define what the keepout diff --git a/doc/letter_size.tab b/doc/letter_size.tab index 9d7459c..29b633b 100644 --- a/doc/letter_size.tab +++ b/doc/letter_size.tab @@ -1,6 +1,3 @@ -# $Id$ -# - A .2340 B .2380 C .2420 diff --git a/doc/metric_size.tab b/doc/metric_size.tab index 3db5222..cfa464e 100644 --- a/doc/metric_size.tab +++ b/doc/metric_size.tab @@ -1,6 +1,3 @@ -# $Id$ -# - 0.20_mm .00787 0.25_mm .00984 0.30_mm .0118 diff --git a/doc/pcb.texi b/doc/pcb.texi index 850b748..db214a2 100644 --- a/doc/pcb.texi +++ b/doc/pcb.texi @@ -1,5 +1,4 @@ \input texinfo @c -*-texinfo-*- -@comment RCS: $Id$ @comment %**start of header @setfilename pcb.info @settitle Pcb diff --git a/doc/refcard.tex b/doc/refcard.tex index 8072351..a735e1c 100644 --- a/doc/refcard.tex +++ b/doc/refcard.tex @@ -1,4 +1,3 @@ -% $Id$ % % COPYRIGHT % diff --git a/doc/wire_size.tab b/doc/wire_size.tab index d72997f..8f57752 100644 --- a/doc/wire_size.tab +++ b/doc/wire_size.tab @@ -1,6 +1,3 @@ -# $Id$ -# - 97 .0059 96 .0063 95 .0067 diff --git a/doc/wishlist.txt b/doc/wishlist.txt index e462abe..737a06d 100644 --- a/doc/wishlist.txt +++ b/doc/wishlist.txt @@ -1,6 +1,3 @@ -# $Id$ -# - This file is the start of a wish list of features/improvements in no particular order. diff --git a/example/Makefile.am b/example/Makefile.am index 9f7b034..6a14876 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,5 +1,3 @@ -## $Id$ - examplesdir= @docdir@/examples examples_DATA= ${EXAMPLES} diff --git a/example/libraries/Makefile.am b/example/libraries/Makefile.am index 21392aa..9a33712 100644 --- a/example/libraries/Makefile.am +++ b/example/libraries/Makefile.am @@ -1,5 +1,3 @@ -## $Id$ - examplesdir= @docdir@/examples/libraries examples_DATA= ${EXAMPLES} diff --git a/example/libraries/example.inc b/example/libraries/example.inc index 2ee0ec6..32c43b4 100644 --- a/example/libraries/example.inc +++ b/example/libraries/example.inc @@ -1,5 +1,4 @@ # -*- m4 -*- -# $Id$ # # Example .inc file diff --git a/example/libraries/example.m4 b/example/libraries/example.m4 index 2253a3c..ff2641d 100644 --- a/example/libraries/example.m4 +++ b/example/libraries/example.m4 @@ -1,6 +1,5 @@ divert(-1) # -*- m4 -*- -# $Id$ # define(`Description_my_RC0402', ``Standard SMT resistor/capacitor (0402)'') diff --git a/globalconst.h b/globalconst.h index afba0d4..e0779d5 100755 --- a/globalconst.h +++ b/globalconst.h @@ -22,7 +22,6 @@ * Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany * Tho...@rz... * - * RCS: $Id$ */ /* global constants diff --git a/lib/CreateLibrary.sh.in b/lib/CreateLibrary.sh.in index 13ffa5e..6dd4f39 100755 --- a/lib/CreateLibrary.sh.in +++ b/lib/CreateLibrary.sh.in @@ -23,7 +23,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # creates a library # diff --git a/lib/CreateLibraryContents.sh.in b/lib/CreateLibraryContents.sh.in index ccba4a3..8f38224 100755 --- a/lib/CreateLibraryContents.sh.in +++ b/lib/CreateLibraryContents.sh.in @@ -23,7 +23,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # create all objects as defined in passed list_files # diff --git a/lib/ListLibraryContents.sh.in b/lib/ListLibraryContents.sh.in index cee49df..9e453b7 100755 --- a/lib/ListLibraryContents.sh.in +++ b/lib/ListLibraryContents.sh.in @@ -23,7 +23,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # list the contents of a library # diff --git a/lib/QueryLibrary.sh.in b/lib/QueryLibrary.sh.in index b5bed20..f053ced 100755 --- a/lib/QueryLibrary.sh.in +++ b/lib/QueryLibrary.sh.in @@ -23,7 +23,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # query a library # diff --git a/lib/TTL_74xx_DIL.list b/lib/TTL_74xx_DIL.list index e51b4bc..7fbaac4 100755 --- a/lib/TTL_74xx_DIL.list +++ b/lib/TTL_74xx_DIL.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/TTL_74xx_DIL.m4 b/lib/TTL_74xx_DIL.m4 index df52b7f..ca3fe0f 100755 --- a/lib/TTL_74xx_DIL.m4 +++ b/lib/TTL_74xx_DIL.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # define(`Description_7400_dil', ``4 dual-NAND'') define(`Param1_7400_dil', 14) diff --git a/lib/amp.inc b/lib/amp.inc index cca93b9..e1fcf55 100644 --- a/lib/amp.inc +++ b/lib/amp.inc @@ -1,6 +1,5 @@ # -*- m4 -*- # -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/amphenol.inc b/lib/amphenol.inc index e41f874..b88ed39 100755 --- a/lib/amphenol.inc +++ b/lib/amphenol.inc @@ -1,6 +1,5 @@ # -*- m4 -*- # -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/amphenol.list b/lib/amphenol.list index 1393b15..d2690d2 100755 --- a/lib/amphenol.list +++ b/lib/amphenol.list @@ -1,4 +1,3 @@ -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/amphenol.m4 b/lib/amphenol.m4 index fb499cf..c2c4f3c 100755 --- a/lib/amphenol.m4 +++ b/lib/amphenol.m4 @@ -1,5 +1,4 @@ divert(-1) -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/bourns.inc b/lib/bourns.inc index 0ebc298..23eee32 100644 --- a/lib/bourns.inc +++ b/lib/bourns.inc @@ -1,6 +1,5 @@ # -*- m4 -*- # -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/candk.inc b/lib/candk.inc index 94e59b9..6ad6072 100644 --- a/lib/candk.inc +++ b/lib/candk.inc @@ -1,6 +1,5 @@ # -*- m4 -*- # -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/common.m4 b/lib/common.m4 index bc619c8..4c1f494 100644 --- a/lib/common.m4 +++ b/lib/common.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # common defines for packages # diff --git a/lib/connector.inc b/lib/connector.inc index 3bd8195..689f204 100755 --- a/lib/connector.inc +++ b/lib/connector.inc @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # connector packages diff --git a/lib/connector.list b/lib/connector.list index d38e622..0af58a8 100755 --- a/lib/connector.list +++ b/lib/connector.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/connector.m4 b/lib/connector.m4 index a264c19..ae1575c 100755 --- a/lib/connector.m4 +++ b/lib/connector.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # define(`Description_connector2', `connector 2x1 pins') define(`Param1_connector2', 1) diff --git a/lib/crystal.list b/lib/crystal.list index ad9c265..da0c7b4 100755 --- a/lib/crystal.list +++ b/lib/crystal.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/crystal.m4 b/lib/crystal.m4 index bf2979d..cf7e4b2 100755 --- a/lib/crystal.m4 +++ b/lib/crystal.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # define(`Description_crystal_300', `crystal 300mil') define(`Param1_crystal_300', 300) diff --git a/lib/cts.inc b/lib/cts.inc index cf0b648..e1f281c 100644 --- a/lib/cts.inc +++ b/lib/cts.inc @@ -1,6 +1,5 @@ # -*- m4 -*- # -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/dil.inc b/lib/dil.inc index d1cde4a..6a75e0a 100755 --- a/lib/dil.inc +++ b/lib/dil.inc @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # DIL packages diff --git a/lib/geda.inc b/lib/geda.inc index d25dd1d..985c18a 100644 --- a/lib/geda.inc +++ b/lib/geda.inc @@ -1,5 +1,4 @@ # -*- m4 -*- -# $Id$ # # gEDA compatible footprint names # diff --git a/lib/gen_geda_list.awk b/lib/gen_geda_list.awk index 0770b47..fc73e5a 100755 --- a/lib/gen_geda_list.awk +++ b/lib/gen_geda_list.awk @@ -1,7 +1,5 @@ #!/usr/bin/awk -f # -# $Id$ -# # Script to regenerate geda.list from geda.inc # # Usage: diff --git a/lib/gen_geda_m4.awk b/lib/gen_geda_m4.awk index 88994de..ccbf4d8 100755 --- a/lib/gen_geda_m4.awk +++ b/lib/gen_geda_m4.awk @@ -1,7 +1,5 @@ #!/usr/bin/awk -f # -# $Id$ -# # Script to regenerate geda.m4 from geda.inc # # Usage: diff --git a/lib/gen_list.awk b/lib/gen_list.awk index 5a9e8cd..b3d672e 100755 --- a/lib/gen_list.awk +++ b/lib/gen_list.awk @@ -1,7 +1,5 @@ #!/usr/bin/awk -f # -# $Id$ -# # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/gen_m4.awk b/lib/gen_m4.awk index 2b16867..544f686 100755 --- a/lib/gen_m4.awk +++ b/lib/gen_m4.awk @@ -1,7 +1,5 @@ #!/usr/bin/awk -f # -# $Id$ -# # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/generic.list b/lib/generic.list index bc31768..2fc70ab 100755 --- a/lib/generic.list +++ b/lib/generic.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/generic.m4 b/lib/generic.m4 index cd19fcd..a08cac0 100755 --- a/lib/generic.m4 +++ b/lib/generic.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # define(`Description_generic8_dil', ``generic'') define(`Param1_generic8_dil', 8) diff --git a/lib/jerry.list b/lib/jerry.list index 903e853..6d03af9 100644 --- a/lib/jerry.list +++ b/lib/jerry.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # Arcade machine parts needed by Scott "Jerry" Lawrence # js...@ab... diff --git a/lib/jerry.m4 b/lib/jerry.m4 index f3f742c..28dd30f 100644 --- a/lib/jerry.m4 +++ b/lib/jerry.m4 @@ -23,8 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ -# # Arcade machine parts needed by Scott "Jerry" Lawrence # js...@ab... diff --git a/lib/johnstech.inc b/lib/johnstech.inc index 926a3ad..0a11fee 100644 --- a/lib/johnstech.inc +++ b/lib/johnstech.inc @@ -1,5 +1,4 @@ # -*- m4 -*- -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/linear.list b/lib/linear.list index 80eabe3..ab120fd 100755 --- a/lib/linear.list +++ b/lib/linear.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/linear.m4 b/lib/linear.m4 index ba01501..5b8e695 100755 --- a/lib/linear.m4 +++ b/lib/linear.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # define(`Description_MAX222_dil', `high-speed dual RS232 driver w. shutdown') define(`Param1_MAX222_dil', 18) diff --git a/lib/logic.list b/lib/logic.list index 8777e57..9f59eb5 100755 --- a/lib/logic.list +++ b/lib/logic.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/logic.m4 b/lib/logic.m4 index 517767a..15a2cb1 100755 --- a/lib/logic.m4 +++ b/lib/logic.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # ------------------------------------------------------------------------ # based on mail by Olaf Kaluza (ol...@cr...) diff --git a/lib/lsi.list b/lib/lsi.list index d805435..b98afdf 100755 --- a/lib/lsi.list +++ b/lib/lsi.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/lsi.m4 b/lib/lsi.m4 index c495f90..99dd15c 100755 --- a/lib/lsi.m4 +++ b/lib/lsi.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # ---------------------------------------------------------------------- # several different microcontrollers from the PIC family diff --git a/lib/m4lib_to_newlib.sh b/lib/m4lib_to_newlib.sh index 09499b6..6ca4b81 100644 --- a/lib/m4lib_to_newlib.sh +++ b/lib/m4lib_to_newlib.sh @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# # This script is used to extract all elements from an "oldlib" (M4) # style library and place them in individual "newlib" style files. diff --git a/lib/memory.list b/lib/memory.list index 00e7b88..ed58e7f 100755 --- a/lib/memory.list +++ b/lib/memory.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/memory.m4 b/lib/memory.m4 index 8bdceeb..7af73fb 100755 --- a/lib/memory.m4 +++ b/lib/memory.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # define(`Description_27512_dil', `EPROM 64Kx8') define(`Param1_27512_dil', 28) diff --git a/lib/minicircuits.inc b/lib/minicircuits.inc index 22174a5..9ec6218 100644 --- a/lib/minicircuits.inc +++ b/lib/minicircuits.inc @@ -1,6 +1,5 @@ # -*- m4 -*- # -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/misc.inc b/lib/misc.inc index 380d511..f34a3fc 100755 --- a/lib/misc.inc +++ b/lib/misc.inc @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # misc packages # diff --git a/lib/nichicon.inc b/lib/nichicon.inc index 545e1d4..f96c151 100644 --- a/lib/nichicon.inc +++ b/lib/nichicon.inc @@ -1,6 +1,5 @@ # -*- m4 -*- # -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/optek.inc b/lib/optek.inc index 943f0c4..711ecde 100644 --- a/lib/optek.inc +++ b/lib/optek.inc @@ -1,6 +1,5 @@ # -*- m4 -*- # -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/optical.list b/lib/optical.list index 8fa292b..1a78dfb 100755 --- a/lib/optical.list +++ b/lib/optical.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/optical.m4 b/lib/optical.m4 index 92b6a17..24a7f52 100755 --- a/lib/optical.m4 +++ b/lib/optical.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # most (all at the beginning) of the data was provided by # Volker Bosch (bo...@ie...) diff --git a/lib/panasonic.inc b/lib/panasonic.inc index 5c3b85a..b539cd6 100644 --- a/lib/panasonic.inc +++ b/lib/panasonic.inc @@ -1,6 +1,5 @@ # -*- m4 -*- # -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/pci.inc b/lib/pci.inc index 762749e..23d9189 100644 --- a/lib/pci.inc +++ b/lib/pci.inc @@ -1,5 +1,3 @@ -# $Id$ -# # Definitions for PCI boards # by D.J. Barrow dj_...@ar... # diff --git a/lib/pci.list b/lib/pci.list index 0ddcb59..44f9fbd 100644 --- a/lib/pci.list +++ b/lib/pci.list @@ -1,6 +1,3 @@ -# $Id$ -# - PCI5V_AVE_HEIGHT:PCI5V_AVE_HEIGHT:PCI5V_AVE_HEIGHT PCI5V_MIN_HEIGHT:PCI5V_MIN_HEIGHT:PCI5V_MIN_HEIGHT PCI5V_MAX_HEIGHT:PCI5V_MAX_HEIGHT:PCI5V_MAX_HEIGHT diff --git a/lib/pci.m4 b/lib/pci.m4 index 632ec7d..4dfa176 100644 --- a/lib/pci.m4 +++ b/lib/pci.m4 @@ -1,5 +1,4 @@ divert(-1) -# $Id$ # # Definitions for PCI boards # by D.J. Barrow dj_...@ar... diff --git a/lib/plcc.inc b/lib/plcc.inc index 5e1a1dc..cbe7458 100755 --- a/lib/plcc.inc +++ b/lib/plcc.inc @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # PLCC packages # diff --git a/lib/png_diff.sh b/lib/png_diff.sh index 478c19c..ee557fd 100755 --- a/lib/png_diff.sh +++ b/lib/png_diff.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# $Id$ -# # Copyright (c) 2003, 2004, 2005, 2006, 2007 Dan McMahill # This program is free software; you can redistribute it and/or modify diff --git a/lib/qfn.inc b/lib/qfn.inc index d8fb50f..5710cc6 100644 --- a/lib/qfn.inc +++ b/lib/qfn.inc @@ -1,5 +1,4 @@ # -*- m4 -*- -# $Id$ # COPYRIGHT # # PCB, interactive printed circuit board design diff --git a/lib/qfp-ui.in b/lib/qfp-ui.in index f6261a1..fe0b8d0 100755 --- a/lib/qfp-ui.in +++ b/lib/qfp-ui.in @@ -1,6 +1,5 @@ #!@WISH@ -f -# $Id$ # # User Interface that generates custom QFP and SOIC packages for pcb-1.6.3 # Invoked from a line like diff --git a/lib/qfp.inc b/lib/qfp.inc index 0ceaeed..a0598d4 100644 --- a/lib/qfp.inc +++ b/lib/qfp.inc @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # QFP packages # diff --git a/lib/qfp2.inc b/lib/qfp2.inc index 04f6aa2..130f237 100644 --- a/lib/qfp2.inc +++ b/lib/qfp2.inc @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # QFP packages # diff --git a/lib/qfpdj.inc b/lib/qfpdj.inc index 51e30b1..98c5d5b 100644 --- a/lib/qfpdj.inc +++ b/lib/qfpdj.inc @@ -24,7 +24,6 @@ # Improvments by D.J. Barrow dj_...@ar... # Further improved by W. Kazubski <wk...@ir...> # -# RCS: $Id$ # # QFP packages # diff --git a/lib/resistor_0.25W.list b/lib/resistor_0.25W.list index 3c68234..71e27dc 100755 --- a/lib/resistor_0.25W.list +++ b/lib/resistor_0.25W.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/resistor_0.25W.m4 b/lib/resistor_0.25W.m4 index 3487ab6..b83a624 100755 --- a/lib/resistor_0.25W.m4 +++ b/lib/resistor_0.25W.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # define(`Description_r_025', ``R 0.25W'') diff --git a/lib/resistor_adjust.list b/lib/resistor_adjust.list index a211622..b6d2657 100644 --- a/lib/resistor_adjust.list +++ b/lib/resistor_adjust.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/resistor_adjust.m4 b/lib/resistor_adjust.m4 index ec13611..10def9f 100644 --- a/lib/resistor_adjust.m4 +++ b/lib/resistor_adjust.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # most (all at the beginning) of the data was provided by # Volker Bosch (bo...@ie...) diff --git a/lib/resistor_array.list b/lib/resistor_array.list index f659ba8..32ed7af 100755 --- a/lib/resistor_array.list +++ b/lib/resistor_array.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/resistor_array.m4 b/lib/resistor_array.m4 index bdf96e0..a939410 100755 --- a/lib/resistor_array.m4 +++ b/lib/resistor_array.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # ---------------------------------------------------------------------- # resistor array without common pin diff --git a/lib/rules.inc b/lib/rules.inc index aee42f9..244e592 100644 --- a/lib/rules.inc +++ b/lib/rules.inc @@ -1,5 +1,4 @@ # -# $Id$ # # design rule definitions -- # tune design rules here diff --git a/lib/smt.inc b/lib/smt.inc index ace76a0..eba644a 100644 --- a/lib/smt.inc +++ b/lib/smt.inc @@ -1,5 +1,4 @@ # -*- m4 -*- -# $Id$ # # surface mounted components # diff --git a/lib/texas_inst_amplifier.list b/lib/texas_inst_amplifier.list index 531aaad..4776a48 100755 --- a/lib/texas_inst_amplifier.list +++ b/lib/texas_inst_amplifier.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/texas_inst_amplifier.m4 b/lib/texas_inst_amplifier.m4 index 01c2ea5..47572f1 100755 --- a/lib/texas_inst_amplifier.m4 +++ b/lib/texas_inst_amplifier.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # define(`Description_TL070_dil', `Single low noise JFET input operational amplifier') define(`Param1_TL070_dil', 8) diff --git a/lib/texas_inst_voltage_reg.list b/lib/texas_inst_voltage_reg.list index 862cea9..100e641 100644 --- a/lib/texas_inst_voltage_reg.list +++ b/lib/texas_inst_voltage_reg.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/texas_inst_voltage_reg.m4 b/lib/texas_inst_voltage_reg.m4 index a6fdb2f..5a1052c 100644 --- a/lib/texas_inst_voltage_reg.m4 +++ b/lib/texas_inst_voltage_reg.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # define(`Description_uA7905C',`-5V 1.5A voltage regulator') diff --git a/lib/transistor.list b/lib/transistor.list index 2e7d339..f814079 100755 --- a/lib/transistor.list +++ b/lib/transistor.list @@ -22,7 +22,6 @@ # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # mask package values... # diff --git a/lib/transistor.m4 b/lib/transistor.m4 index fa33af6..fa112fe 100755 --- a/lib/transistor.m4 +++ b/lib/transistor.m4 @@ -23,7 +23,6 @@ divert(-1) # Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany # Tho...@rz... # -# RCS: $Id$ # # most data by Volker Bosch (bo...@ie... # diff --git a/newlib/2_pin_thru-hole_packages/Makefile.am b/newlib/2_pin_thru-hole_packages/Makefile.am index 18f59ed..bc67252 100644 --- a/newlib/2_pin_thru-hole_packages/Makefile.am +++ b/newlib/2_pin_thru-hole_packages/Makefile.am @@ -1,6 +1,3 @@ -## $Id$ -## - pcblibsubdir= @PCBTREEDIR@/2_pin_thru-hole_packages pcblibsub_DATA= ${COMPONENTS} COMPONENTS= \ diff --git a/newlib/Makefile.am b/newlib/Makefile.am index e38b946..da5dc95 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -1,5 +1,3 @@ -## $Id$ -## ## Top level 'newlib' automake file SUBDIRS=\ diff --git a/newlib/connectors/Makefile.am b/newlib/connectors/Makefile.am index b1d56c8..b261d4d 100644 --- a/newlib/connectors/Makefile.am +++ b/newlib/connectors/Makefile.am @@ -1,6 +1,3 @@ -## $Id$ -## - pcblibsubdir= @PCBTREEDIR@/connectors pcblibsub_DATA= ${COMPONENTS} COMPONENTS= \ diff --git a/newlib/crystal/Makefile.am b/newlib/crystal/Makefile.am index a45bf12..f91a2d2 100644 --- a/newlib/crystal/Makefile.am +++ b/newlib/crystal/Makefile.am @@ -1,6 +1,3 @@ -## $Id$ -## - pcblibsubdir= @PCBTREEDIR@/crystal pcblibsub_DATA= ${COMPONENTS} COMPONENTS= \ diff --git a/newlib/electro-optics/Ma... [truncated message content] |
From: <gi...@gp...> - 2011-12-23 21:37:54
|
The branch, master has been updated via 77785825fc7fe8a69401dd5d8f856b4425a6b0f2 (commit) from c7bc8afec69a3b534714fbe360deaef4e8819215 (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/hid/common/hidgl.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) ================= Commit Messages ================= commit 77785825fc7fe8a69401dd5d8f856b4425a6b0f2 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/common/hidgl.c: Simplify angle calculation for drawing line caps Make use of atan2 to avoid special casing horizontal lines, and move make the input variables doubles to be consistent with that function. Our use of "tanl" was inappropriate for the float input, dobule output variables we were using before (spotted by Dan McMahill). I have modified the semantic meaning of angle, to keep the more conventional angle = atan2 (dy, dx); geometry. This means the angle now refers to the angle of the line, not the angle of the line-cap start. (The angle is adjusted before passing into the cap drawing routines). :100644 100644 7ec148f... 15273a6... M src/hid/common/hidgl.c ========= Changes ========= commit 77785825fc7fe8a69401dd5d8f856b4425a6b0f2 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/common/hidgl.c: Simplify angle calculation for drawing line caps Make use of atan2 to avoid special casing horizontal lines, and move make the input variables doubles to be consistent with that function. Our use of "tanl" was inappropriate for the float input, dobule output variables we were using before (spotted by Dan McMahill). I have modified the semantic meaning of angle, to keep the more conventional angle = atan2 (dy, dx); geometry. This means the angle now refers to the angle of the line, not the angle of the line-cap start. (The angle is adjusted before passing into the cap drawing routines). diff --git a/src/hid/common/hidgl.c b/src/hid/common/hidgl.c index 7ec148f..15273a6 100644 --- a/src/hid/common/hidgl.c +++ b/src/hid/common/hidgl.c @@ -215,7 +215,7 @@ void hidgl_draw_line (int cap, Coord width, Coord x1, Coord y1, Coord x2, Coord y2, double scale) { double angle; - float deltax, deltay, length; + double deltax, deltay, length; float wdx, wdy; int circular_caps = 0; int hairline = 0; @@ -233,7 +233,6 @@ hidgl_draw_line (int cap, Coord width, Coord x1, Coord y1, Coord x2, Coord y2, d if (length == 0) { /* Assume the orientation of the line is horizontal */ - angle = 0; wdx = -width / 2.; wdy = 0; length = 1.; @@ -242,16 +241,10 @@ hidgl_draw_line (int cap, Coord width, Coord x1, Coord y1, Coord x2, Coord y2, d } else { wdy = deltax * width / 2. / length; wdx = -deltay * width / 2. / length; - - if (deltay == 0.) - angle = (deltax < 0) ? 270. : 90.; - else - angle = 180. / M_PI * atanl (deltax / deltay); - - if (deltay < 0) - angle += 180.; } + angle = -180. / M_PI * atan2 (deltay, deltax); + switch (cap) { case Trace_Cap: case Round_Cap: @@ -278,8 +271,8 @@ hidgl_draw_line (int cap, Coord width, Coord x1, Coord y1, Coord x2, Coord y2, d /* Don't bother capping hairlines */ if (circular_caps && !hairline) { - draw_cap (width, x1, y1, angle, scale); - draw_cap (width, x2, y2, angle + 180., scale); + draw_cap (width, x1, y1, angle + 90., scale); + draw_cap (width, x2, y2, angle - 90., scale); } } |
From: <gi...@gp...> - 2011-12-23 00:02:30
|
The branch, master has been updated via c7bc8afec69a3b534714fbe360deaef4e8819215 (commit) via c2a56b84d76e2c23eafce8cd0a562cb39b381c66 (commit) from a34b40add60310a51780f359cc90d9c5ee75752c (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 ========= data/Makefile.am | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) ================= Commit Messages ================= commit c2a56b84d76e2c23eafce8cd0a562cb39b381c66 Author: Dan McMahill <da...@mc...> Commit: Dan McMahill <da...@mc...> Remove duplicate line. :100644 100644 13f519e... dbe56ed... M data/Makefile.am ========= Changes ========= commit c2a56b84d76e2c23eafce8cd0a562cb39b381c66 Author: Dan McMahill <da...@mc...> Commit: Dan McMahill <da...@mc...> Remove duplicate line. diff --git a/data/Makefile.am b/data/Makefile.am index 13f519e..dbe56ed 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -65,8 +65,6 @@ application_in_files = \ x-excellon.desktop.in application_DATA = $(application_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - install_icon_exec = \ $(SETENV) GTK_UPDATE_ICON_CACHE_BIN="@GTK_UPDATE_ICON_CACHE_BIN@" \ $(SHELL) $(top_srcdir)/icon-theme-installer \ |
From: <gi...@gp...> - 2011-12-22 20:49:24
|
The branch, master has been updated via a34b40add60310a51780f359cc90d9c5ee75752c (commit) from 4a303a4ae56b38cd6dd1f602dffa0c7af3f15a02 (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 ========= gts/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ================= Commit Messages ================= commit a34b40add60310a51780f359cc90d9c5ee75752c Author: DJ Delorie <dj...@de...> Commit: DJ Delorie <dj...@de...> Don't install gts files Closes-bug: lp-854396 :100644 100644 ad7c938... 41ab870... M gts/Makefile.am ========= Changes ========= commit a34b40add60310a51780f359cc90d9c5ee75752c Author: DJ Delorie <dj...@de...> Commit: DJ Delorie <dj...@de...> Don't install gts files Closes-bug: lp-854396 diff --git a/gts/Makefile.am b/gts/Makefile.am index ad7c938..41ab870 100644 --- a/gts/Makefile.am +++ b/gts/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir) -DG_LOG_DOMAIN=\"Gts\" -lib_LIBRARIES = libgts.a +noinst_LIBRARIES = libgts.a libgts_a_SOURCES = \ object.c \ @@ -44,5 +44,5 @@ libgts_a_SOURCES = \ curvature.c \ tribox3.c -include_HEADERS = \ +noinst_HEADERS = \ gts.h |
From: <gi...@gp...> - 2011-12-22 16:34:41
|
The branch, master has been updated via 4a303a4ae56b38cd6dd1f602dffa0c7af3f15a02 (commit) via a3da8e96096109c4a28f562a8c8f891b7915f0ba (commit) via aba41a7ee2f2c0ace082998d5e6c0f2cbff84147 (commit) from 8c891cdff4a410934a3aa60f99b377d4b0ebcf77 (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 | 1 - src/create.c | 1 + src/global.h | 1 + src/move.c | 17 +++++++++++------ src/polygon.c | 6 ++++++ src/set.c | 8 ++++++++ 6 files changed, 27 insertions(+), 7 deletions(-) ================= Commit Messages ================= commit 4a303a4ae56b38cd6dd1f602dffa0c7af3f15a02 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Properly cancel rubberband move when user changes mode Closes-bug: lp-853609 :100644 100644 7c637c1... 18fffa7... M src/set.c commit a3da8e96096109c4a28f562a8c8f891b7915f0ba Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Update line RUBBERENDFLAG after move, even for trivial moves If you move a line segment, then drop it in its original place, the rubberband preview will be incorrect every other time you do this. This patch fixes that. Note that there is still incorrect behavior if the user starts a rubberband move, then hits Esc, then tries again. Affects-bug: lp-853609 :100644 100644 6b6359a... 56ced53... M src/move.c commit aba41a7ee2f2c0ace082998d5e6c0f2cbff84147 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Revert previous commit, only update clipping for visible buffers This also fixes the undo bug, but without the performance hit. (It may not fix other synchronization bugs, but given that we haven't seen any, this should be okay.) Affects-bug: lp-699272 :100644 100644 38f0a3f... ac2aa54... M src/buffer.c :100644 100644 a199acc... 8d8344c... M src/create.c :100644 100644 9f0390b... 8896901... M src/global.h :100644 100644 14f239d... 1114e33... M src/polygon.c ========= Changes ========= commit 4a303a4ae56b38cd6dd1f602dffa0c7af3f15a02 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Properly cancel rubberband move when user changes mode Closes-bug: lp-853609 diff --git a/src/set.c b/src/set.c index 7c637c1..18fffa7 100644 --- a/src/set.c +++ b/src/set.c @@ -53,6 +53,7 @@ #include "error.h" #include "find.h" #include "misc.h" +#include "move.h" #include "set.h" #include "undo.h" #include "pcb-printf.h" @@ -288,6 +289,13 @@ SetMode (int Mode) Settings.Mode = Mode; AdjustAttachedObjects (); } + /* Cancel rubberband move */ + else if (Settings.Mode == MOVE_MODE) + MoveObjectAndRubberband (Crosshair.AttachedObject.Type, + Crosshair.AttachedObject.Ptr1, + Crosshair.AttachedObject.Ptr2, + Crosshair.AttachedObject.Ptr3, + 0, 0); else { if (Settings.Mode == ARC_MODE || Settings.Mode == LINE_MODE) commit a3da8e96096109c4a28f562a8c8f891b7915f0ba Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Update line RUBBERENDFLAG after move, even for trivial moves If you move a line segment, then drop it in its original place, the rubberband preview will be incorrect every other time you do this. This patch fixes that. Note that there is still incorrect behavior if the user starts a rubberband move, then hits Esc, then tries again. Affects-bug: lp-853609 diff --git a/src/move.c b/src/move.c index 6b6359a..56ced53 100644 --- a/src/move.c +++ b/src/move.c @@ -800,8 +800,6 @@ MoveObjectAndRubberband (int Type, void *Ptr1, void *Ptr2, void *Ptr3, /* setup offset */ DeltaX = DX; DeltaY = DY; - if (DX == 0 && DY == 0) - return (NULL); /* move all the lines... and reset the counter */ ptr = Crosshair.AttachedObject.Rubberband; @@ -809,14 +807,21 @@ MoveObjectAndRubberband (int Type, void *Ptr1, void *Ptr2, void *Ptr3, { /* first clear any marks that we made in the line flags */ CLEAR_FLAG (RUBBERENDFLAG, ptr->Line); - AddObjectToMoveUndoList (LINEPOINT_TYPE, - ptr->Layer, ptr->Line, ptr->MovedPoint, DX, - DY); - MoveLinePoint (ptr->Layer, ptr->Line, ptr->MovedPoint); + /* only update undo list if an actual movement happened */ + if (DX != 0 || DY != 0) + { + AddObjectToMoveUndoList (LINEPOINT_TYPE, + ptr->Layer, ptr->Line, + ptr->MovedPoint, DX, DY); + MoveLinePoint (ptr->Layer, ptr->Line, ptr->MovedPoint); + } Crosshair.AttachedObject.RubberbandN--; ptr++; } + if (DX == 0 && DY == 0) + return (NULL); + AddObjectToMoveUndoList (Type, Ptr1, Ptr2, Ptr3, DX, DY); ptr2 = ObjectOperation (&MoveFunctions, Type, Ptr1, Ptr2, Ptr3); IncrementUndoSerialNumber (); commit aba41a7ee2f2c0ace082998d5e6c0f2cbff84147 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Revert previous commit, only update clipping for visible buffers This also fixes the undo bug, but without the performance hit. (It may not fix other synchronization bugs, but given that we haven't seen any, this should be okay.) Affects-bug: lp-699272 diff --git a/src/buffer.c b/src/buffer.c index 38f0a3f..ac2aa54 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -378,7 +378,6 @@ MovePolygonToBuffer (LayerType *layer, PolygonType *polygon) if (!lay->polygon_tree) lay->polygon_tree = r_create_tree (NULL, 0, 0); r_insert_entry (lay->polygon_tree, (BoxType *)polygon, 0); - InitClip (Dest, lay, polygon); return (polygon); } diff --git a/src/create.c b/src/create.c index a199acc..8d8344c 100644 --- a/src/create.c +++ b/src/create.c @@ -152,6 +152,7 @@ CreateNewPCB (bool SetDefaultNames) ptr = (PCBTypePtr)calloc (1, sizeof (PCBType)); ptr->Data = CreateNewBuffer (); ptr->Data->pcb = (PCBTypePtr) ptr; + ptr->Data->polyClip = 1; ptr->ThermStyle = 4; ptr->IsleArea = 2.e8; diff --git a/src/global.h b/src/global.h index 9f0390b..8896901 100644 --- a/src/global.h +++ b/src/global.h @@ -404,6 +404,7 @@ typedef struct /* holds all objects */ *rat_tree; struct PCBType *pcb; LayerType Layer[MAX_LAYER + 2]; /* add 2 silkscreen layers */ + int polyClip; } DataType, *DataTypePtr; typedef struct /* holds drill information */ diff --git a/src/polygon.c b/src/polygon.c index 14f239d..1114e33 100644 --- a/src/polygon.c +++ b/src/polygon.c @@ -1626,6 +1626,9 @@ PlowsPolygon (DataType * Data, int type, void *ptr1, void *ptr2, void RestoreToPolygon (DataType * Data, int type, void *ptr1, void *ptr2) { + if (!Data->polyClip) + return; + if (type == POLYGON_TYPE) InitClip (PCB->Data, (LayerTypePtr) ptr1, (PolygonTypePtr) ptr2); else @@ -1635,6 +1638,9 @@ RestoreToPolygon (DataType * Data, int type, void *ptr1, void *ptr2) void ClearFromPolygon (DataType * Data, int type, void *ptr1, void *ptr2) { + if (!Data->polyClip) + return; + if (type == POLYGON_TYPE) InitClip (PCB->Data, (LayerTypePtr) ptr1, (PolygonTypePtr) ptr2); else |
From: <gi...@gp...> - 2011-12-21 20:45:00
|
The branch, master has been updated via 8c891cdff4a410934a3aa60f99b377d4b0ebcf77 (commit) from 4e241279907be0bc3d7753fb6d499b8551a13cda (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 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ================= Commit Messages ================= commit 8c891cdff4a410934a3aa60f99b377d4b0ebcf77 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Clip polygons after moving between buffers When moving a polygon between buffers (i.e., from the undo buffer to the PCB->Data buffer or vice-versa), line- and via-clipping is not recalculated. This means that any elements drawn on a buffer before the polygon is moved there, will not clip the polygon. One way (the only way, AFAIK) to make this happen is by bug lp-699272, which can reproduced as follows. I have inclided my explanation of what is happening at each step. 1. Draw a polygon with a line intersecting it, with clearpoly set and visible clearance between the two.a 2. Delete the polygon. [This moves the polygon verbatim, including its clipped form, from PCB->Data to RemoveList, the undo buffer.] 3. Delete the line. [This moves it from PCB->Data to RemoveList, calling RestoreToPolygon() to unclip any polygons on the screen (but there aren't any!), then ClearFromPolygon() to clip the polygon in the undo buffer (but this is already clipped!). In other words, the line is deleted and the polygon unchanged.] 4. Hit undo. [This moves the line from the undo buffer back to PCB->Data, calling RestoreToPolygon() to unclip the polygon in the undo buffer, then ClearFromPolygon() to clip any polygons on the screen (but there aren't any!). So the polygon is no longer clipped.] 5. Hit undo. [This brings the polygon back, copying it verbatim from the undo buffer to PCB->Data. As it is not clipped here, it isn't clipped on the screen, giving rise to the "no clipping" bug.] This patch adds a call to InitClip() to MovePolygonToBuffer(), which forces a recalculation of a polygon's clipping when it is moved between buffers. This is perhaps not the most efficient fix, but will prevent any such synchronization bugs. Closes-bug: lp-699272 :100644 100644 ac2aa54... 38f0a3f... M src/buffer.c ========= Changes ========= commit 8c891cdff4a410934a3aa60f99b377d4b0ebcf77 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Clip polygons after moving between buffers When moving a polygon between buffers (i.e., from the undo buffer to the PCB->Data buffer or vice-versa), line- and via-clipping is not recalculated. This means that any elements drawn on a buffer before the polygon is moved there, will not clip the polygon. One way (the only way, AFAIK) to make this happen is by bug lp-699272, which can reproduced as follows. I have inclided my explanation of what is happening at each step. 1. Draw a polygon with a line intersecting it, with clearpoly set and visible clearance between the two.a 2. Delete the polygon. [This moves the polygon verbatim, including its clipped form, from PCB->Data to RemoveList, the undo buffer.] 3. Delete the line. [This moves it from PCB->Data to RemoveList, calling RestoreToPolygon() to unclip any polygons on the screen (but there aren't any!), then ClearFromPolygon() to clip the polygon in the undo buffer (but this is already clipped!). In other words, the line is deleted and the polygon unchanged.] 4. Hit undo. [This moves the line from the undo buffer back to PCB->Data, calling RestoreToPolygon() to unclip the polygon in the undo buffer, then ClearFromPolygon() to clip any polygons on the screen (but there aren't any!). So the polygon is no longer clipped.] 5. Hit undo. [This brings the polygon back, copying it verbatim from the undo buffer to PCB->Data. As it is not clipped here, it isn't clipped on the screen, giving rise to the "no clipping" bug.] This patch adds a call to InitClip() to MovePolygonToBuffer(), which forces a recalculation of a polygon's clipping when it is moved between buffers. This is perhaps not the most efficient fix, but will prevent any such synchronization bugs. Closes-bug: lp-699272 diff --git a/src/buffer.c b/src/buffer.c index ac2aa54..38f0a3f 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -378,6 +378,7 @@ MovePolygonToBuffer (LayerType *layer, PolygonType *polygon) if (!lay->polygon_tree) lay->polygon_tree = r_create_tree (NULL, 0, 0); r_insert_entry (lay->polygon_tree, (BoxType *)polygon, 0); + InitClip (Dest, lay, polygon); return (polygon); } |
From: <gi...@gp...> - 2011-12-21 01:16:37
|
The branch, master has been updated via 4e241279907be0bc3d7753fb6d499b8551a13cda (commit) via f71dc448e8f68dc8f97b303918737aedc907da45 (commit) from df91527ba7530fdf5b6bf0d2d398ac799bb0e1ec (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/hid/gtk/ghid-route-style-selector.c | 35 +++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 4 deletions(-) ================= Commit Messages ================= commit 4e241279907be0bc3d7753fb6d499b8551a13cda Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: allow route style selector to have nothing selected The affects the the function ghid_route_style_selector_sync() function, which is called from the RouteStylesChanged action to keep the GUI in sync with pcb's state. It selects the route style that matches pcb's state, or if none exists, does nothing. This patch replaces "does nothing" with "deselects all styles", so that the GUI will not be misleading. Closes-bug: lp-699299 :100644 100644 27808e5... 01f2a96... M src/hid/gtk/ghid-route-style-selector.c commit f71dc448e8f68dc8f97b303918737aedc907da45 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: fix memory leak in route style selector When the route style selector is emptied (e.g., when new styles are loaded from a .pcb file), any route style data not owned by pcb core is freed. However, this did not apply to all temporary route style data, even though the pcb core is completely unaware of those. This commit frees all temporary route style data. :100644 100644 2da8160... 27808e5... M src/hid/gtk/ghid-route-style-selector.c ========= Changes ========= commit 4e241279907be0bc3d7753fb6d499b8551a13cda Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: allow route style selector to have nothing selected The affects the the function ghid_route_style_selector_sync() function, which is called from the RouteStylesChanged action to keep the GUI in sync with pcb's state. It selects the route style that matches pcb's state, or if none exists, does nothing. This patch replaces "does nothing" with "deselects all styles", so that the GUI will not be misleading. Closes-bug: lp-699299 diff --git a/src/hid/gtk/ghid-route-style-selector.c b/src/hid/gtk/ghid-route-style-selector.c index 27808e5..01f2a96 100644 --- a/src/hid/gtk/ghid-route-style-selector.c +++ b/src/hid/gtk/ghid-route-style-selector.c @@ -52,6 +52,8 @@ struct _GHidRouteStyleSelector GtkActionGroup *action_group; GtkAccelGroup *accel_group; + GtkRadioAction *null_action; + GtkWidget *null_button; gint shortcut_key_idx; GtkListStore *model; @@ -77,6 +79,17 @@ struct _route_style gulong sig_id; }; +static void +init_radio_groups (GHidRouteStyleSelector *rss) +{ + gtk_radio_action_set_group (rss->null_action, rss->action_radio_group); + rss->action_radio_group = gtk_radio_action_get_group (rss->null_action); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (rss->null_button), + rss->button_radio_group); + rss->button_radio_group = gtk_radio_button_get_group + (GTK_RADIO_BUTTON (rss->null_button)); +} + /* SIGNAL HANDLERS */ /*! \brief Callback for user selection of a route style */ static void @@ -392,6 +405,12 @@ ghid_route_style_selector_new () rss->accel_group = gtk_accel_group_new (); rss->action_group = gtk_action_group_new ("RouteStyleSelector"); + rss->null_action = gtk_radio_action_new ("RouteStyleXX", "", + NULL, NULL, -1); + rss->null_button = gtk_radio_button_new (rss->button_radio_group); + init_radio_groups (rss); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (rss->null_button), + GTK_ACTION (rss->null_action)); rss->shortcut_key_idx = 1; /* Create edit button */ @@ -587,6 +606,7 @@ ghid_route_style_selector_sync (GHidRouteStyleSelector *rss, Coord Thick, Coord Hole, Coord Diameter, Coord Keepaway) { + gboolean found_match = FALSE; GtkTreeIter iter; gtk_tree_model_get_iter_first (GTK_TREE_MODEL (rss->model), &iter); do @@ -604,9 +624,13 @@ ghid_route_style_selector_sync (GHidRouteStyleSelector *rss, (GTK_TOGGLE_ACTION (style->action), TRUE); g_signal_handler_unblock (G_OBJECT (style->action), style->sig_id); rss->active_style = style; + found_match = TRUE; } } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (rss->model), &iter)); + + if (!found_match) + gtk_radio_action_set_current_value (rss->null_action, -1); } /*! \brief Removes all styles from a route style selector */ @@ -642,5 +666,6 @@ ghid_route_style_selector_empty (GHidRouteStyleSelector *rss) rss->action_radio_group = NULL; rss->button_radio_group = NULL; rss->shortcut_key_idx = 1; + init_radio_groups (rss); } commit f71dc448e8f68dc8f97b303918737aedc907da45 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: fix memory leak in route style selector When the route style selector is emptied (e.g., when new styles are loaded from a .pcb file), any route style data not owned by pcb core is freed. However, this did not apply to all temporary route style data, even though the pcb core is completely unaware of those. This commit frees all temporary route style data. diff --git a/src/hid/gtk/ghid-route-style-selector.c b/src/hid/gtk/ghid-route-style-selector.c index 2da8160..27808e5 100644 --- a/src/hid/gtk/ghid-route-style-selector.c +++ b/src/hid/gtk/ghid-route-style-selector.c @@ -68,7 +68,7 @@ struct _GHidRouteStyleSelectorClass struct _route_style { - gboolean temporary; /* TODO: actually use this for something */ + gboolean temporary; GtkRadioAction *action; GtkWidget *button; GtkWidget *menu_item; @@ -622,9 +622,6 @@ ghid_route_style_selector_empty (GHidRouteStyleSelector *rss) &iter, DATA_COL, &rsdata, -1); if (rsdata->action) { -#if 0 - gtk_action_disconnect_accelerator (GTK_ACTION (rsdata->action)); -#endif gtk_action_group_remove_action (rss->action_group, GTK_ACTION (rsdata->action)); g_object_unref (G_OBJECT (rsdata->action)); @@ -633,6 +630,11 @@ ghid_route_style_selector_empty (GHidRouteStyleSelector *rss) gtk_widget_destroy (GTK_WIDGET (rsdata->button)); if (rsdata->menu_item) gtk_widget_destroy (GTK_WIDGET (rsdata->menu_item)); + if (rsdata->temporary) + { + free (rsdata->rst->Name); + g_free (rsdata->rst); + } gtk_tree_row_reference_free (rsdata->rref); free (rsdata); } |