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: <gi...@gp...> - 2011-03-13 04:03:05
|
The branch, master has been updated
via 64bbe4248f8b194a6a8d620c477744f702d1781b (commit)
from f7b6acf1e1761df4302dc4599608017248530aec (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
=========
configure.ac | 2 +-
src/action.c | 5 +++--
src/hid/png/png.c | 6 +++---
src/main.c | 3 +++
4 files changed, 10 insertions(+), 6 deletions(-)
=================
Commit Messages
=================
commit 64bbe4248f8b194a6a8d620c477744f702d1781b
Author: Bob Paddock <bob...@gm...>
Commit: DJ Delorie <dj...@de...>
Use rand() in place of random().
The 'random', 'srandom', functions are those from BSD derived UNIX's,
and may not be available under WIN32. The 'rand' and 'srand'
functions are required by the ANSI standard.
rand(): Return a random integer between 0 and RAND_MAX inclusive.
random(): Return a random long integer between 0 and RAND_MAX inclusive.
Standard MinGW stdlib.h only supports rand() and RAND_MAX is limited
to the 32 bit value of 32767, which is significantly smaller than that
returned by random(). This turncation of range should not effect
usage in our application.
Added srand( time(NULL) ) to main.c to set the seed.
:100644 100644 8fde977... b139388... M configure.ac
:100644 100644 de2738e... 63ef37e... M src/action.c
:100644 100644 06e22bb... 022da9c... M src/hid/png/png.c
:100644 100644 3fff933... a344596... M src/main.c
=========
Changes
=========
commit 64bbe4248f8b194a6a8d620c477744f702d1781b
Author: Bob Paddock <bob...@gm...>
Commit: DJ Delorie <dj...@de...>
Use rand() in place of random().
The 'random', 'srandom', functions are those from BSD derived UNIX's,
and may not be available under WIN32. The 'rand' and 'srand'
functions are required by the ANSI standard.
rand(): Return a random integer between 0 and RAND_MAX inclusive.
random(): Return a random long integer between 0 and RAND_MAX inclusive.
Standard MinGW stdlib.h only supports rand() and RAND_MAX is limited
to the 32 bit value of 32767, which is significantly smaller than that
returned by random(). This turncation of range should not effect
usage in our application.
Added srand( time(NULL) ) to main.c to set the seed.
diff --git a/configure.ac b/configure.ac
index 8fde977..b139388 100644
--- a/configure.ac
+++ b/configure.ac
@@ -651,7 +651,7 @@ AC_CHECK_FUNCS(regcomp re_comp)
AC_CHECK_FUNCS(logf expf rint)
AC_CHECK_FUNCS(vsnprintf)
AC_CHECK_FUNCS(getpwuid getcwd)
-AC_CHECK_FUNCS(random)
+AC_CHECK_FUNCS(rand random)
AC_CHECK_FUNCS(stat)
AC_CHECK_FUNCS(mkdtemp)
diff --git a/src/action.c b/src/action.c
index de2738e..63ef37e 100644
--- a/src/action.c
+++ b/src/action.c
@@ -72,6 +72,7 @@
#include "macro.h"
#include <assert.h>
+#include <stdlib.h> /* rand() */
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
@@ -7158,8 +7159,8 @@ ActionElementList (int argc, char **argv, int x, int y)
if (d > 0)
{
- nx += random () % (d*2) - d;
- ny += random () % (d*2) - d;
+ nx += rand () % (d*2) - d;
+ ny += rand () % (d*2) - d;
}
if (nx < 0)
diff --git a/src/hid/png/png.c b/src/hid/png/png.c
index 06e22bb..022da9c 100644
--- a/src/hid/png/png.c
+++ b/src/hid/png/png.c
@@ -768,12 +768,12 @@ png_do_export (HID_Attr_Val * options)
else
{
rgb (&cop, 140, 150, 160);
-#if 1
- r = (random() % 5 - 2) * 2;
+
+ r = (rand() % 5 - 2) * 2;
cop.r += r;
cop.g += r;
cop.b += r;
-#endif
+
}
if (cc == TOP_SHADOW)
diff --git a/src/main.c b/src/main.c
index 3fff933..a344596 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,6 +40,7 @@
#include <signal.h>
#include <unistd.h>
#include <sys/stat.h>
+#include <time.h> /* Seed for srand() */
#include "global.h"
#include "data.h"
@@ -906,6 +907,8 @@ main (int argc, char *argv[])
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ srand ( time(NULL) ); /* Set seed for rand() */
+
hid_init ();
hid_load_settings ();
|
|
From: <gi...@gp...> - 2011-03-13 03:06:58
|
The branch, master has been updated
via f7b6acf1e1761df4302dc4599608017248530aec (commit)
via 2a1e66236a45a5aa9be55b992b3d509548dcb70c (commit)
from 08805bad16c623f5e1a1878f19ec085d306faec7 (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
=========
po/LINGUAS | 1 +
po/nl.po | 2543 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 2544 insertions(+), 0 deletions(-)
create mode 100644 po/nl.po
=================
Commit Messages
=================
commit f7b6acf1e1761df4302dc4599608017248530aec
Author: Bert Timmerman <ber...@xs...>
Commit: DJ Delorie <dj...@de...>
Added an entry for the Dutch translation in LINGUAS.
:100644 100644 2ccede6... 5af1fed... M po/LINGUAS
commit 2a1e66236a45a5aa9be55b992b3d509548dcb70c
Author: Bert Timmerman <ber...@xs...>
Commit: DJ Delorie <dj...@de...>
First issue of the Dutch translation.
:000000 100644 0000000... 4105867... A po/nl.po
=========
Changes
=========
commit f7b6acf1e1761df4302dc4599608017248530aec
Author: Bert Timmerman <ber...@xs...>
Commit: DJ Delorie <dj...@de...>
Added an entry for the Dutch translation in LINGUAS.
diff --git a/po/LINGUAS b/po/LINGUAS
index 2ccede6..5af1fed 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,3 @@
fr
ru
+nl
commit 2a1e66236a45a5aa9be55b992b3d509548dcb70c
Author: Bert Timmerman <ber...@xs...>
Commit: DJ Delorie <dj...@de...>
First issue of the Dutch translation.
diff --git a/po/nl.po b/po/nl.po
new file mode 100644
index 0000000..4105867
--- /dev/null
+++ b/po/nl.po
@@ -0,0 +1,2543 @@
+# Dutch translation for the gEDA pcb package.
+# Copyright (C) 1994,1995,1996 Thomas Nau
+# Copyright (C) 1997, 1998, 1999, 2000, 2001 Harry Eaton
+# This file is distributed under the same license as the pcb package.
+# Bert Timmerman <ber...@xs...>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pcb VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-31 19:41+0100\n"
+"PO-Revision-Date: 2010-12-31 19:42+0100\n"
+"Last-Translator: Bert Timmerman <ber...@xs...>\n"
+"Language-Team: Bert Timmerman <ber...@xs...>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/pcb.desktop.in.h:1
+msgid "Create and edit printed circuit board designs"
+msgstr "Creer en bewerk gedrukte bedrading ontwerpen"
+
+#: ../data/pcb.desktop.in.h:2
+msgid "PCB Design"
+msgstr "PCB Ontwerp"
+
+#: ../data/pcb.desktop.in.h:3
+msgid "PCB Designer"
+msgstr "PCB Ontwerper"
+
+#: ../data/pcb.xml.in.h:1
+#: ../data/x-excellon.desktop.in.h:1
+msgid "Excellon drill file"
+msgstr "Excellon boor bestand"
+
+#: ../data/pcb.xml.in.h:2
+#: ../data/x-gerber.desktop.in.h:1
+msgid "Gerber file"
+msgstr "Gerber bestand"
+
+#: ../data/pcb.xml.in.h:3
+#: ../data/x-pcb-footprint.desktop.in.h:1
+msgid "PCB footprint"
+msgstr "PCB voetafdruk"
+
+#: ../data/pcb.xml.in.h:4
+#: ../data/x-pcb-layout.desktop.in.h:1
+msgid "PCB layout"
+msgstr "PCB opmaak"
+
+#: ../data/pcb.xml.in.h:5
+#: ../data/x-pcb-netlist.desktop.in.h:1
+msgid "PCB netlist"
+msgstr "PCB netlijst"
+
+#: ../src/action.c:567
+#, c-format
+msgid "Unknown stroke %s\n"
+msgstr "Onbekende slag %s\n"
+
+#: ../src/action.c:764
+#, c-format
+msgid "Error: function hash size too small (%d vs %lu at %s:%d)\n"
+msgstr "Fout: functie hash grootte te klein (%d vs. %lu op %s:%d)\n"
+
+#. Change 'char' to 'int' and remove this when we get to 256
+#. strings to hash.
+#: ../src/action.c:772
+#, c-format
+msgid "Error: function hash type too small (%d vs %lu at %s:%d)\n"
+msgstr "Fout: functie hash type te klein (%d vs. %lu op %s:%d)\n"
+
+#: ../src/action.c:1027
+msgid ""
+"You must turn via visibility on before\n"
+"you can place vias\n"
+msgstr ""
+"Je moet zichtbaarheid aanzetten voordat\n"
+"je vias kan plaatsen\n"
+
+#: ../src/action.c:1393
+#: ../src/change.c:2273
+msgid "Enter text:"
+msgstr "Voer tekst in:"
+
+#: ../src/action.c:1471
+#: ../src/action.c:1614
+#: ../src/action.c:1673
+#: ../src/action.c:1727
+#: ../src/action.c:4102
+#: ../src/action.c:6825
+#: ../src/move.c:490
+#: ../src/move.c:581
+#: ../src/move.c:681
+#: ../src/move.c:758
+#: ../src/rotate.c:434
+msgid "Sorry, the object is locked\n"
+msgstr "Sorry, het object is op slot\n"
+
+#: ../src/action.c:1863
+#, c-format
+msgid ""
+"Rules are minspace %d.%02d, minoverlap %d.%d minwidth %d.%02d, minsilk %d.%02d\n"
+"min drill %d.%02d, min annular ring %d.%02d\n"
+msgstr ""
+"Regels zijn min ruimte %d.%02d, min overlappend %d.%d min wijdte %d.%02d, min opdruk %d.%02d\n"
+"min boordiam %d.%02d, min ring %d.%02d\n"
+
+#: ../src/action.c:1878
+msgid "No DRC problems found.\n"
+msgstr "Geen DRC problemen gevonden.\n"
+
+#: ../src/action.c:1880
+#, c-format
+msgid "Found %d design rule errors.\n"
+msgstr "Vond %d fouten op ontwerp regels.\n"
+
+#: ../src/action.c:1882
+#, c-format
+msgid "Aborted DRC after %d design rule errors.\n"
+msgstr "DRC afgebroken na %d fouten in ontwerp regels.\n"
+
+# FIXME: original string needs correction.
+# "Don't combine metric/imperial grids like that!\n"
+#: ../src/action.c:2252
+msgid "Don't combine metric/English grids like that!\n"
+msgstr "Combineer geen Engelse/metrische rasters op deze manier!\n"
+
+#: ../src/action.c:2361
+msgid "Click on a connection"
+msgstr "Klik op een verbinding"
+
+#: ../src/action.c:2865
+#: ../src/action.c:8000
+msgid "Click on an element"
+msgstr "Klik op een element"
+
+#.
+#. * We deal with the case where name already exists in this
+#. * function so the GUI doesn't need to deal with it
+#.
+#: ../src/action.c:3316
+msgid "Save Renumber Annotation File As ..."
+msgstr "Sla het hernummer annotatie bestand op als ..."
+
+#: ../src/action.c:3317
+msgid ""
+"Choose a file to record the renumbering to.\n"
+"This file may be used to back annotate the\n"
+"change to the schematics.\n"
+msgstr ""
+"Kies een bestand om de hernummering op te nemen.\n"
+"Dit bestand kan genruikt worden om de veranderingen\n"
+"naar het schema over te brengen.\n"
+
+#: ../src/action.c:3342
+#: ../src/action.c:6147
+#: ../src/hid/gtk/gtkhid-main.c:1318
+msgid "File exists! Ok to overwrite?"
+msgstr "Bestand bestaat! Ok om te overschrijven ?"
+
+#: ../src/action.c:3352
+#, c-format
+msgid "Could not open %s\n"
+msgstr "Kan %s niet openen\n"
+
+#: ../src/action.c:3941
+msgid ""
+"Auto-placement can NOT be undone.\n"
+"Do you want to continue anyway?\n"
+msgstr ""
+"Automatisch plaatsen kan NIET ongedaan worden.\n"
+"Wil je evengoed toch door gaan?\n"
+
+#: ../src/action.c:4192
+#: ../src/action.c:4261
+#: ../src/action.c:4625
+#: ../src/action.c:4715
+#: ../src/action.c:4770
+#: ../src/action.c:4848
+#: ../src/action.c:4911
+#: ../src/action.c:4971
+#: ../src/action.c:5032
+#: ../src/action.c:5092
+#: ../src/action.c:5155
+#: ../src/action.c:5220
+#: ../src/action.c:5284
+#: ../src/action.c:5334
+#: ../src/action.c:6594
+#: ../src/action.c:8201
+msgid "Select an Object"
+msgstr "Selecteer een Object"
+
+#: ../src/action.c:4663
+#: ../src/action.c:5955
+msgid "Enter the layout name:"
+msgstr "Voer de layout naam in:"
+
+#: ../src/action.c:4671
+msgid "Enter the layer name:"
+msgstr "Voer de laagnaam in:"
+
+#: ../src/action.c:5444
+#: ../src/action.c:5630
+msgid "Enter pattern:"
+msgstr "Voer het patroon in:"
+
+#: ../src/action.c:5515
+msgid "Select the Element's Mark Location"
+msgstr "Selecteer het lokatiemerk van het Element"
+
+#: ../src/action.c:5907
+msgid "OK to override layout data?"
+msgstr "OK om opmaak gegevens te overschrijven ?"
+
+#: ../src/action.c:5922
+msgid "OK to override changes?"
+msgstr "OK om wijzigingen door te voeren ?"
+
+#: ../src/action.c:5950
+msgid "OK to clear layout data?"
+msgstr "OK om opmaak gegevens te wissen ?"
+
+#: ../src/action.c:6113
+msgid "Buffer has no elements!\n"
+msgstr "Buffer heeft geen elementen!\n"
+
+#: ../src/action.c:6119
+msgid "Save Paste Buffer As ..."
+msgstr "Sla plak buffer op als ..."
+
+#: ../src/action.c:6120
+msgid ""
+"Choose a file to save the contents of the\n"
+"paste buffer to.\n"
+msgstr ""
+"Kies een bestand om de inhoud van de\n"
+"plak buffer in op te slaan.\n"
+
+#: ../src/action.c:6547
+msgid "Nothing found under crosshair\n"
+msgstr "Niets onder kruisdraad gevonden\n"
+
+#: ../src/action.c:6809
+#, c-format
+msgid "%s(): Flag \"%s\" is not valid\n"
+msgstr "%s(): Vlag \"%s\" is niet geldig\n"
+
+#: ../src/action.c:6904
+#, c-format
+msgid "Could not open actions file \"%s\".\n"
+msgstr "Kon aktiebestand \"%s\" niet openen.\n"
+
+#: ../src/action.c:7254
+#, c-format
+msgid "Cannot change attribute of %s - element not found\n"
+msgstr "Kan attribuut van %s niet wijzigen - element niet gevonden\n"
+
+#. error
+#: ../src/action.c:7322
+msgid "Cannot fork!"
+msgstr "Kan niet afsplitsen!"
+
+#: ../src/action.c:7470
+#, c-format
+msgid "%s(): Unable to determine temp directory name from the temp file\n"
+msgstr "%s(): Onmogelijk om de naam van de tijdelijke werkmap vast te stellen aan de hand van het tijdelijke bestand\n"
+
+#: ../src/action.c:7493
+#, c-format
+msgid "Failed to unlink \"%s\"\n"
+msgstr "Faalde om \"%s\" te ontkoppelen\n"
+
+#: ../src/action.c:7645
+msgid "Enter dispersion:"
+msgstr "Voer een verspreiding in:"
+
+#: ../src/action.c:7671
+msgid "Click on a location"
+msgstr "Klik op een locatie"
+
+#: ../src/action.c:7695
+msgid "Bad syntax for Import(setnewpoint)"
+msgstr "Slechte spelling voor Import(setnewpoint)"
+
+#: ../src/action.c:7781
+#: ../src/action.c:7843
+msgid "Could not create temp file"
+msgstr "Kan geen tijdelijk bestand creeren"
+
+#: ../src/action.c:7897
+#, c-format
+msgid "Unknown import mode: %s\n"
+msgstr "Onbekende importmodus: %s\n"
+
+#: ../src/action.c:7941
+msgid "This GUI doesn't support Attribute Editing\n"
+msgstr "Deze GUI ondersteund geen Attribuut bewerkingen\n"
+
+#: ../src/action.c:7968
+#, c-format
+msgid "No layer named %s\n"
+msgstr "Geen laag genaamd %s\n"
+
+#: ../src/action.c:7994
+msgid "Too many elements selected\n"
+msgstr "Te veel elementen geselecteerd\n"
+
+#: ../src/action.c:8007
+msgid "No element found there\n"
+msgstr "Geen element hier gevonden\n"
+
+#: ../src/action.c:8111
+msgid "Click on Object or Flip Point"
+msgstr "Klik op Object of Draaipunt"
+
+#: ../src/action.c:8183
+msgid "Select item to use attributes from"
+msgstr "Selecteer een item om attributen van te gebruiken"
+
+#: ../src/autoplace.c:776
+#: ../src/rats.c:746
+#: ../src/rats.c:840
+msgid "Can't add rat lines because no netlist is loaded.\n"
+msgstr "Kan geen ratlijnen toevogen omdat er geen netlijst geladen is.\n"
+
+#: ../src/autoplace.c:783
+msgid "No elements selected to autoplace.\n"
+msgstr "Geen elementen geselecteerd voor automatisch plaatsen.\n"
+
+#: ../src/buffer.c:933
+msgid "Error! Buffer doesn't contain a single element\n"
+msgstr "Fout! Buffer bevat geen enkel element\n"
+
+#: ../src/buffer.c:1154
+msgid ""
+"Warning: All of the pads are on the opposite\n"
+"side from the component - that's probably not what\n"
+"you wanted\n"
+msgstr ""
+"Waarschuwing: Alle pads zijn aan de tegenovergestelde\n"
+"zijde van het component - dat is waarschijnlijk niet wat\n"
+"U wilde\n"
+
+#: ../src/buffer.c:1185
+msgid ""
+"There was nothing to convert!\n"
+"Elements must have some silk, pads or pins.\n"
+msgstr ""
+"Er was niets te converteren!\n"
+"Elementen moeten opdruk, pads of pennen hebben.\n"
+
+#: ../src/buffer.c:1190
+msgid ""
+"There were polygons that can't be made into pins!\n"
+"So they were not included in the element\n"
+msgstr ""
+"Er waren polygons die niet tot pen gemaakt kunnen worden !\n"
+"Deze zijn niet in het element opgenomen\n"
+
+#: ../src/buffer.c:1494
+msgid "You can't mirror a buffer that has elements!\n"
+msgstr "Je kunt geen buffer spiegelen die elementen bevat!\n"
+
+#: ../src/buffer.c:1502
+msgid "You can't mirror a buffer that has text!\n"
+msgstr "je kunt geen buffer spiegelen die een tekst bevat!\n"
+
+#: ../src/change.c:753
+msgid ""
+"To change the clearance of objects in a polygon, change the objects, not the polygon.\n"
+"Hint: To set a minimum clearance for a group of objects, select them all then :MinClearGap(Selected,=10,mil)"
+msgstr ""
+"Om de vrijloop van een objekt te wijzigen in een polygoon, wijzig de objekten, niet het polygoon.\n"
+"Hint: Om een minimum vrijloop in te stellen voor een groep van objekten, selecteer deze allemaal en dan :MinClearGap(Selected,=10,mil)"
+
+#: ../src/change.c:1044
+#, c-format
+msgid "Error: The name \"%s\" is not unique!\n"
+msgstr "Fout: De naam \"%s\" is niet uniek!\n"
+
+#: ../src/change.c:2253
+msgid "Linename:"
+msgstr "Lijnnaam:"
+
+#: ../src/change.c:2258
+msgid "Vianame:"
+msgstr "Vianaam:"
+
+#: ../src/change.c:2263
+#, c-format
+msgid "%s Pin Name:"
+msgstr "%s Pennaam:"
+
+#: ../src/change.c:2268
+#, c-format
+msgid "%s Pad Name:"
+msgstr "%s Padnaam:"
+
+#: ../src/change.c:2278
+msgid "Elementname:"
+msgstr "Elementnaam:"
+
+#: ../src/create.c:251
+#, c-format
+msgid "Dropping via at (%d, %d) because it's hole would overlap with the via at (%d, %d)\n"
+msgstr "Laat via op (%d, %d) vallen omdat het gat de via op (%d, %d) bedekt\n"
+
+#: ../src/create.c:273
+#, c-format
+msgid "Mapped via drill hole to %.2f mils from %.2f mils per vendor table\n"
+msgstr "Opgezochte via boorgat naar %.2f mils vanaf %.2f mils uit de vendor tabel\n"
+
+#: ../src/create.c:291
+#, c-format
+msgid "Increased via thickness to %.2f mils to allow enough copper at (%.2f,%.2f).\n"
+msgstr "Vergrootte de via dikte naar %.2f mils om genoeg koper te hebben op (%.2f,%.2f).\n"
+
+#: ../src/create.c:823
+#, c-format
+msgid "Did not map pin #%s (%s) drill hole because %6.2f mil is below the minimum allowed size\n"
+msgstr "Heb pen #%s (%s) boorgat niet opgezocht omdat %6.2f mil beneden de minimaal toeglaten afmeting is\n"
+
+#: ../src/create.c:831
+#, c-format
+msgid "Did not map pin #%s (%s) drill hole because %6.2f mil is above the maximum allowed size\n"
+msgstr "Heb pen #%s (%s) boorgat niet opgezocht omdat %6.2f mil boven de maximaal toegelaten afmeting is\n"
+
+#: ../src/create.c:840
+#, c-format
+msgid "Did not map pin #%s (%s) drill hole because %6.2f mil does not leave enough copper\n"
+msgstr "Heb pen #%s (%s) boorgat niet opgezocht omdat %6.2f mil laat niet genoeg koper over\n"
+
+#: ../src/create.c:854
+#, c-format
+msgid "Mapped pin drill hole to %.2f mils from %.2f mils per vendor table\n"
+msgstr "Opgezochte pen boorgat naar %.2f mils vanaf %.2f mils uit de vendor tabel\n"
+
+#: ../src/create.c:959
+#, c-format
+msgid "Can't find font-symbol-file '%s'\n"
+msgstr "Kan font-symbol-file '%s' niet vinden\n"
+
+#: ../src/error.c:109
+#: ../src/error.c:113
+#, c-format
+msgid ""
+"Can't open file\n"
+" '%s'\n"
+"fopen() returned: '%s'\n"
+msgstr ""
+"Kan bestand niet openen\n"
+" '%s'\n"
+"fopen() retourneerde: '%s'\n"
+
+#: ../src/error.c:129
+#: ../src/error.c:133
+#, c-format
+msgid ""
+"Can't execute command\n"
+" '%s'\n"
+"popen() returned: '%s'\n"
+msgstr ""
+"Kan opdracht niet uitvoeren\n"
+" '%s'\n"
+"popen() retourneerdd: '%s'\n"
+
+#: ../src/error.c:149
+#: ../src/error.c:153
+#, c-format
+msgid ""
+"Can't scan directory\n"
+" '%s'\n"
+"opendir() returned: '%s'\n"
+msgstr ""
+"Kan bestandenmap niet doorzoeken\n"
+" '%s'\n"
+"opendir() retourneerde: '%s'\n"
+
+#: ../src/error.c:169
+#: ../src/error.c:173
+#, c-format
+msgid ""
+"Can't change working directory to\n"
+" '%s'\n"
+"chdir() returned: '%s'\n"
+msgstr ""
+"Kan werkmap niet veranderen naar\n"
+" '%s'\n"
+"chdir() retourneerde: '%s'\n"
+
+#: ../src/file.c:226
+#, c-format
+msgid "File '%s' exists, use anyway?"
+msgstr "Bestand '%s' bestaat al, evengoed gebruiken?"
+
+#. not used
+#. CheckAndOpenFile deals with the case where fname already exists
+#: ../src/file.c:268
+msgid "Save Connection Data As ..."
+msgstr "Sla Verbinding gegevens op als ..."
+
+#: ../src/file.c:269
+msgid "Choose a file to save all connection data to."
+msgstr "Kies een bestand om alle verbindinggegevens op te slaan."
+
+#: ../src/file.c:386
+#, c-format
+msgid "File '%s' has no font information, using default font\n"
+msgstr "Bestand '%s' heeft geen lettertype informatie, gebruik standaard lettertype\n"
+
+#: ../src/file.c:992
+#, c-format
+msgid "Trying to save your layout in '%s'\n"
+msgstr "Probeer jouw opmaak op te slaan in '%s'\n"
+
+# FIXME: is this an Error: or a Warning: ?
+#: ../src/file.c:1156
+msgid "LoadNewlibFootprintsFromDir: Could not determine initial working directory\n"
+msgstr "LoadNewlibFootprintsFromDir: Kon geen initieele werkmap vaststellen\n"
+
+# FIXME: is this an Error: or a Warning: ?
+#: ../src/file.c:1174
+msgid "LoadNewlibFootprintsFromDir: Could not determine new working directory\n"
+msgstr "LoadNewlibFootprintsFromDir: Kon geen nieuwe werkmap vaststellen\n"
+
+# FIXME: is this an Error: or a Warning: ?
+#: ../src/file.c:1281
+msgid "ParseLibraryTree: Could not determine initial working directory\n"
+msgstr "ParseLibraryTree: Kon geen initieele erkmap vaststellen\n"
+
+# FIXME: is this an Error: or a Warning: ?
+#: ../src/file.c:1316
+msgid "ParseLibraryTree: Could not determine new working directory\n"
+msgstr "ParseLibraryTree: Kon geen nieuwe werkmap vaststellen\n"
+
+#. nothing to do
+#: ../src/file.c:1499
+#, c-format
+msgid "Importing PCB netlist %s\n"
+msgstr "Importeer PCB netlijst %s\n"
+
+#: ../src/file.c:1537
+#, c-format
+msgid ""
+"Line length (%i) exceeded in netlist file.\n"
+"additional characters will be ignored.\n"
+msgstr ""
+"Lijn lengte (%i) overschreden in netlijst bestand.\n"
+"toegevoegde karakters worden genegeerd.\n"
+
+#: ../src/file.c:1591
+msgid "Empty netlist file!\n"
+msgstr "Leeg netlijst bestand!\n"
+
+#: ../src/file.c:1632
+#, c-format
+msgid "Importing edif netlist %s\n"
+msgstr "Importeer edif netlijst %s\n"
+
+#: ../src/find.c:248
+#, c-format
+msgid "near (%.*f, %.*f)\n"
+msgstr "bij (%.*f, %.*f)\n"
+
+#: ../src/find.c:256
+#, c-format
+msgid "WARNING! Design Rule error - %s\n"
+msgstr "WAARSCHUWING! Ontwerp Regel fout - %s\n"
+
+#: ../src/find.c:257
+#, c-format
+msgid "near location (%.*f, %.*f)\n"
+msgstr "nabij locatie (%.*f, %.*f)\n"
+
+#.
+#. * message when asked about continuing DRC checks after next
+#. * violation is found.
+#.
+#: ../src/find.c:266
+msgid "Press Next to continue DRC checking"
+msgstr "Druk op Volgende om DRC controle voor te zetten"
+
+#: ../src/find.c:267
+msgid "Next"
+msgstr "Volgende"
+
+#: ../src/find.c:268
+msgid "Cancel"
+msgstr "Afbreken"
+
+#: ../src/find.c:947
+#, c-format
+msgid "bad layer number %d max_copper_layer=%d in find.c\n"
+msgstr "slecht laag nummer %d max_copper_layer=%d in find.c\n"
+
+#: ../src/find.c:994
+msgid "WARNING: Hole too close to pin.\n"
+msgstr "WAARSCHUWING: Gat te dicht bij pen.\n"
+
+#: ../src/find.c:996
+msgid "WARNING: Hole too close to via.\n"
+msgstr "WAARSCHUWING: Gat te dicht bij via.\n"
+
+#: ../src/find.c:1060
+msgid "WARNING: Hole too close to line.\n"
+msgstr "WAARSCHUWING: Gat te dicht bij lijn.\n"
+
+#: ../src/find.c:1080
+msgid "WARNING: Hole too close to pad.\n"
+msgstr "WAARSCHUWING: Gat te dicht bij pad.\n"
+
+#: ../src/find.c:1100
+msgid "WARNING: Hole touches arc.\n"
+msgstr "WAARSCHUWING: Gat raakt boog.\n"
+
+#: ../src/find.c:3664
+msgid "Potential for broken trace"
+msgstr "Mogelijk gebroken spoor"
+
+#: ../src/find.c:3665
+msgid ""
+"Insufficient overlap between objects can lead to broken tracks\n"
+"due to registration errors with old wheel style photo-plotters."
+msgstr ""
+"Onvoldoende overlapping tussen objecten kan leiden tot gebroken sporen\n"
+"door de registratie fouten met oude wiel stijl foto-plotters."
+
+#: ../src/find.c:3722
+msgid "Copper areas too close"
+msgstr "Kopergebieden te dicht bijeen"
+
+#: ../src/find.c:3723
+#: ../src/find.c:3867
+msgid ""
+"Circuits that are too close may bridge during imaging, etching,\n"
+"plating, or soldering processes resulting in a direct short."
+msgstr ""
+"Circuits die te dicht bijeen zijn kunnen bruggen vormen tijdens belichten, etsen,\n"
+"beplaten, of soldeer processen resulterend in een directe kortsluiting."
+
+#: ../src/find.c:3812
+msgid "Line with insufficient clearance inside polygon\n"
+msgstr "Lijn met onvoldoende vrijloop binnen polygoon\n"
+
+#: ../src/find.c:3821
+msgid "Arc with insufficient clearance inside polygon\n"
+msgstr "Boog met onvoldoende vrijloop binnen polygoon\n"
+
+#: ../src/find.c:3831
+msgid "Pad with insufficient clearance inside polygon\n"
+msgstr "Pad met onvoldoende vrijloop binnen polygoon\n"
+
+#: ../src/find.c:3840
+msgid "Pin with insufficient clearance inside polygon\n"
+msgstr "Pen met onvoldoende vrijloop binnen polygoon\n"
+
+#: ../src/find.c:3849
+msgid "Via with insufficient clearance inside polygon\n"
+msgstr "Via met onvoldoende vrijloop binnen polygoon\n"
+
+#: ../src/find.c:3993
+msgid "Line width is too thin"
+msgstr "Lijn wijdte is te dun"
+
+#: ../src/find.c:3994
+#: ../src/find.c:4038
+msgid ""
+"Process specifications dictate a minimum feature-width\n"
+"that can reliably be reproduced"
+msgstr ""
+"Proces specificaties dicteren een minimum voorwerp-wijdte\n"
+"die betrouwbaar gereproduceerd kan worden"
+
+# FIXME: original string has room for improvement.
+# "Arc width is too small"
+#: ../src/find.c:4037
+msgid "Arc width is too thin"
+msgstr "Boogwijdte is te dun"
+
+#: ../src/find.c:4082
+msgid "Pin annular ring too small"
+msgstr "Pen ring is te smal"
+
+#: ../src/find.c:4083
+#: ../src/find.c:4205
+msgid ""
+"Annular rings that are too small may erode during etching,\n"
+"resulting in a broken connection"
+msgstr ""
+"Ringen die te smal zijn kunnen eroderen tijdens het etsen,\n"
+"resulterend in een verbroken verbinding"
+
+#: ../src/find.c:4116
+msgid "Pin drill size is too small"
+msgstr "Pen boordiameter is te smal"
+
+#: ../src/find.c:4117
+#: ../src/find.c:4239
+msgid "Process rules dictate the minimum drill size which can be used"
+msgstr "Proces regels dicteren een minimum boordiameter die gebruikt kan worden"
+
+# FIXME: original string has room for improvement.
+# "Pad is too small"
+#: ../src/find.c:4159
+msgid "Pad is too thin"
+msgstr "Pad is te dun"
+
+#: ../src/find.c:4160
+msgid ""
+"Pads which are too thin may erode during etching,\n"
+"resulting in a broken or unreliable connection"
+msgstr ""
+"Pads die te dun zijn kunnen eroderen tijdens het etsen,\n"
+"resulerend in een onbetrouwbare verbinding"
+
+#: ../src/find.c:4204
+msgid "Via annular ring too small"
+msgstr "Via ring te smal"
+
+#: ../src/find.c:4238
+msgid "Via drill size is too small"
+msgstr "Via boordiameter is te klein"
+
+# FIXME: original string has room for improvement.
+# "Silk line is too small"
+#: ../src/find.c:4286
+msgid "Silk line is too thin"
+msgstr "Opdruklijn is te dun"
+
+#: ../src/find.c:4287
+msgid ""
+"Process specifications dictate a minimum silkscreen feature-width\n"
+"that can reliably be reproduced"
+msgstr ""
+"Proces specificaties dicteren een minimum opdruk wijdte\n"
+"die betrouwbaar kan worden gereproduceerd"
+
+# FIXME: original string has room for improvement.
+# "Element %s has %i silk lines which are too small"
+#: ../src/find.c:4341
+#, c-format
+msgid "Element %s has %i silk lines which are too thin"
+msgstr "Element %s heeft %i opdruklijnen welke te dun zijn"
+
+#: ../src/find.c:4352
+msgid ""
+"Process specifications dictate a minimum silkscreen\n"
+"feature-width that can reliably be reproduced"
+msgstr ""
+"Proces specificaties dicteren een minimum opdruk wijdte\n"
+"die betrouwbaar kan worden gereproduceerd"
+
+#: ../src/find.c:4392
+#, c-format
+msgid "Warning: %d pad%s the nopaste flag set.\n"
+msgstr "Waarschuwing: %d pad%s de geen-pasta flag gezet.\n"
+
+#: ../src/find.c:4489
+#, c-format
+msgid "Internal error in BuildObjectList: unknown object type %i\n"
+msgstr "Interne fout in BuildObjectList: onbekend object type %i\n"
+
+#: ../src/hid/common/actions.c:51
+#, c-format
+msgid "ERROR! Invalid action name, action \"%s\" not registered.\n"
+msgstr "FOUT! Ongeldige aktienaam, aktie \"%s\" is niet geregistreerd.\n"
+
+#: ../src/hid/common/actions.c:315
+#, c-format
+msgid "Syntax error: %s\n"
+msgstr "Spelfout: %s\n"
+
+#: ../src/hid/common/actions.c:316
+msgid " expected: Action(arg1, arg2)"
+msgstr " verwachtte: Action(arg1, arg2)"
+
+#: ../src/hid/common/hidnogui.c:339
+msgid "OK to lose data ?"
+msgstr "OK om gegevens te verliezen ?"
+
+#: ../src/hid/gerber/gerber.c:160
+msgid "Error, too many apertures needed for Gerber file.\n"
+msgstr "Fout, te veel openingen nodig voor Gerber bestand.\n"
+
+#: ../src/hid/gtk/gtkhid-main.c:86
+msgid "Various zoom factor changes."
+msgstr "Verschillende zoomfactoren gewijzigd."
+
+#: ../src/hid/gtk/gtkhid-main.c:339
+#, c-format
+msgid "ghid_calibrate() -- not implemented\n"
+msgstr "ghid_calibrate() -- niet geïmplementeerd\n"
+
+#: ../src/hid/gtk/gtkhid-main.c:689
+#: ../src/hid/gtk/gui-dialog.c:165
+msgid "_Cancel"
+msgstr "Afbreken"
+
+#: ../src/hid/gtk/gtkhid-main.c:690
+#: ../src/hid/gtk/gui-dialog.c:169
+msgid "_OK"
+msgstr "_OK"
+
+#: ../src/hid/gtk/gtkhid-main.c:1095
+msgid "Tell the user about this version of PCB."
+msgstr "Vertel de gebruiker over deze versie van PCB."
+
+#: ../src/hid/gtk/gtkhid-main.c:1117
+msgid "Get a coordinate."
+msgstr "Verkrijg een coordinaat."
+
+#: ../src/hid/gtk/gtkhid-main.c:1184
+#, c-format
+msgid "LayerGroupsChanged -- not implemented\n"
+msgstr "LayerGroupsChanged -- niet geïmplementeerd\n"
+
+#. in case we have a dialog for loading a netlist file
+#: ../src/hid/gtk/gtkhid-main.c:1228
+#: ../src/hid/gtk/gui-dialog.c:316
+msgid "Load netlist file"
+msgstr "Laad netlijst bestand"
+
+#. in case we have a dialog for loading a footprint file
+#: ../src/hid/gtk/gtkhid-main.c:1234
+#: ../src/hid/gtk/gui-dialog.c:289
+msgid "Load element to buffer"
+msgstr "Laad element naar buffer"
+
+#: ../src/hid/gtk/gtkhid-main.c:1240
+#: ../src/hid/gtk/gui-dialog.c:303
+msgid "Load layout file to buffer"
+msgstr "Laad opmaak bestand naar buffer"
+
+#. in case we have a dialog for loading a layout file
+#: ../src/hid/gtk/gtkhid-main.c:1246
+#: ../src/hid/gtk/gui-dialog.c:302
+msgid "Load layout file"
+msgstr "Laad opmaak bestand"
+
+#: ../src/hid/gtk/gtkhid-main.c:1272
+msgid "Save layout and/or element data to a user-selected file."
+msgstr "Sla opmaak en/of element data op naar een door de gebruiker geselecteerd bestand."
+
+#: ../src/hid/gtk/gtkhid-main.c:1303
+msgid "Save element as"
+msgstr "Sla element op als"
+
+#: ../src/hid/gtk/gtkhid-main.c:1305
+msgid "Save layout as"
+msgstr "Sla opmaak op als "
+
+#: ../src/hid/gtk/gtkhid-main.c:1321
+#, c-format
+msgid "Overwriting %s\n"
+msgstr "Overschrijf %s\n"
+
+#: ../src/hid/gtk/gtkhid-main.c:1364
+msgid "Swaps the side of the board you're looking at."
+msgstr "Verwissel de zijde van het bord waar U naar kijkt."
+
+#: ../src/hid/gtk/gtkhid-main.c:1489
+msgid "Print the layout."
+msgstr "Druk de opmaak af."
+
+#: ../src/hid/gtk/gtkhid-main.c:1514
+msgid "Can't find a suitable printer HID"
+msgstr "Kan geen bruikbare printer HID vinden"
+
+#: ../src/hid/gtk/gtkhid-main.c:1524
+msgid "Can't print empty layout"
+msgstr "Kan geen lege laag printen"
+
+#: ../src/hid/gtk/gtkhid-main.c:1534
+msgid "Enter Values here:"
+msgstr "Voer waarden in:"
+
+#: ../src/hid/gtk/gtkhid-main.c:1536
+msgid "x-calibration"
+msgstr "x-calibratie"
+
+#: ../src/hid/gtk/gtkhid-main.c:1536
+msgid "X scale for calibrating your printer"
+msgstr "X schaal om de afdrukker te kalibreren"
+
+#: ../src/hid/gtk/gtkhid-main.c:1538
+msgid "y-calibration"
+msgstr "y-calibratie"
+
+#: ../src/hid/gtk/gtkhid-main.c:1538
+msgid "Y scale for calibrating your printer"
+msgstr "Y schaal om de afdrukker te kalibreren"
+
+#: ../src/hid/gtk/gtkhid-main.c:1547
+msgid "Calibrate the printer."
+msgstr "Kalibreer de afdrukker."
+
+#: ../src/hid/gtk/gtkhid-main.c:1564
+msgid "Printer Calibration Values"
+msgstr "Afdrukker kalibreer waarden"
+
+#: ../src/hid/gtk/gtkhid-main.c:1565
+msgid "Enter calibration values for your printer"
+msgstr "Voer kalibreerwaarden in voor Uw afdrukker"
+
+#: ../src/hid/gtk/gtkhid-main.c:1584
+msgid "Can't export empty layout"
+msgstr "Kan geen lege laag exporteren"
+
+#: ../src/hid/gtk/gtkhid-main.c:1617
+#, c-format
+msgid "%g redraws per second\n"
+msgstr "%g hertekenen per seconde\n"
+
+#: ../src/hid/gtk/gtkhid-main.c:1628
+msgid "Moves the pointer to the center of the window."
+msgstr "Verplaats de aanwijzer naar het minden van het venster."
+
+#: ../src/hid/gtk/gtkhid-main.c:1696
+msgid "Move the cursor."
+msgstr "Verplaats de aanwijzer."
+
+#: ../src/hid/gtk/gtkhid-main.c:1790
+msgid "Open various GUI windows."
+msgstr "Open verschillende GUI vensters."
+
+#: ../src/hid/gtk/gtkhid-main.c:1866
+msgid "Set the default measurement units."
+msgstr "Ste de standaard meetunits in."
+
+#: ../src/hid/gtk/gtkhid-main.c:1908
+msgid "Scroll the viewport."
+msgstr "Verschuif het uitzicht."
+
+#: ../src/hid/gtk/gtkhid-main.c:1962
+msgid ""
+"Start or stop panning (Mode = 1 to start, 0 to stop)\n"
+"Optional thumb argument is ignored for now in gtk hid.\n"
+msgstr ""
+"Start of stop schuiven (Modus = 1 om te starten, 0 om te stoppen)\n"
+"Optioneel duimargument is voorlopig genegeerd in gtk hid.\n"
+
+#: ../src/hid/gtk/gtkhid-main.c:1990
+msgid ""
+"The gtk gui currently ignores the optional first argument to the Pan action.\n"
+"Feel free to provide patches.\n"
+msgstr ""
+"De huidige gtk gui negeert het optionele eerste argument van de schuif actie.\n"
+"Voel U niet belemmert om verbeterstukjes te geven.\n"
+
+#: ../src/hid/gtk/gtkhid-main.c:2016
+msgid ""
+"Bring up the popup menu specified by @code{MenuName}.\n"
+"If called by a mouse event then the mouse button number\n"
+"must be specified as the optional second argument."
+msgstr ""
+"Breng een opduikmenu gespecificeerd met @code{MenuName}.\n"
+"Als door een muisgebeurtenis geroepen dan moet het muisknopnummer\n"
+"gespecificeerd worden als tweede optionele argument."
+
+#: ../src/hid/gtk/gtkhid-main.c:2047
+#, c-format
+msgid "Popup(): malloc failed\n"
+msgstr "Popup(): malloc faalde\n"
+
+#: ../src/hid/gtk/gtkhid-main.c:2052
+#, c-format
+msgid "Loading popup \"%s\". Button = %u\n"
+msgstr "Laad opduikvenster \"%s\". Knop = %u\n"
+
+#: ../src/hid/gtk/gtkhid-main.c:2059
+#, c-format
+msgid "The specified popup menu \"%s\" has not been defined.\n"
+msgstr "Het gespecificeerde opduikmenu \"%s\" is niet gedefiniëerd.\n"
+
+#: ../src/hid/gtk/gtkhid-main.c:2076
+msgid "Asks user which schematics to import into PCB.\n"
+msgstr "Vraag de gebruiker welke schema's geïmporteerd in PCB moeten worden.\n"
+
+#: ../src/hid/gtk/gtkhid-main.c:2097
+msgid "Load schematics"
+msgstr "Laad schema's"
+
+#: ../src/hid/gtk/gtkhid-main.c:2127
+msgid "Click on a location to center"
+msgstr "Klik op een locatie om te centreren"
+
+#: ../src/hid/gtk/gtkhid-main.c:2137
+msgid "Click on a place to pan"
+msgstr "Klik op een plaats om te schuiven"
+
+#: ../src/hid/gtk/gtkhid-main.c:2147
+msgid "Click on a place to scroll"
+msgstr "Klik op een plaats om te rollen"
+
+#: ../src/hid/gtk/gtkhid-main.c:2150
+msgid "Click on zoom focus"
+msgstr "Klik op zoom focus"
+
+#: ../src/hid/gtk/gui-command-window.c:80
+msgid "Common commands easily accessible via the gui may not be included here.\n"
+msgstr "Gemakkelijk bereikbare algemene opdrachten middels de gui zijn hier niet bijgesloten.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:82
+msgid ""
+"In user commands below, 'size' values may be absolute or relative\n"
+"if preceded by a '+' or '-'. Where 'units' are indicated, use \n"
+"'mil' or 'mm' otherwise PCB internal units will be used.\n"
+msgstr ""
+"In de gebruikers opdrachten hieronder, kunnen 'size' waarden kunnen absoluut of relatief zijn\n"
+"als deze voorzien zijn van een '+' of '-'. Waar 'units' zijn aangegeven, gebruik \n"
+"'mil' of 'mm' anders worden interne PCB eenheden gebruikt.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:96
+msgid "\tChanges the clearance of objects.\n"
+msgstr "\tVerander de vrijloop van objecten.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:101
+msgid "\tChanges values. Omit 'units' for 'grid' and 'zoom'.\n"
+msgstr "\tVerander waarden. Laat 'units' voor 'grid' en 'zoom' weg.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:105
+msgid "\tChanges the join (clearance through polygons) of objects.\n"
+msgstr "\tVerander de koppeling (vrijloop door polygoons) van objecten.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:111
+msgid "\tToggles, sets, or clears the square flag of objects.\n"
+msgstr "\tWissel, zet, of wis de vierkant vlag van objecten.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:117
+msgid "\tToggles, sets, or clears the octagon flag of objects.\n"
+msgstr "\tWissel, zet, of wis de achtkant vlag van objecten.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:121
+msgid "\tChanges the hole flag of objects.\n"
+msgstr "\tVerander de gat vlag van objecten.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:125
+msgid "\tFlip elements to the opposite side of the board.\n"
+msgstr "\tVerplaats elementen naar de andere zijde van het bord.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:131
+msgid "\tToggle, set or clear a thermal (on the current layer) to pins or vias.\n"
+msgstr "\tWissel, zet, of wis de thermal (op de huidige laag) naar pennen of vias.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:135
+msgid "\tLoad a vendor file. If 'filename' omitted, pop up file select dialog.\n"
+msgstr "\tLaad een leverancier bestand. Als de 'bestandnaam' is weggelaten, toon een selectie venster.\n"
+
+#: ../src/hid/gtk/gui-command-window.c:318
+msgid "PCB Command Entry"
+msgstr "PCB Opdracht Invoer"
+
+#. Make the command reference scrolled text view. Use high level
+#. | utility functions in gui-utils.c
+#.
+#: ../src/hid/gtk/gui-command-window.c:336
+msgid "Command Reference"
+msgstr "Opdrachtreferentie"
+
+#: ../src/hid/gtk/gui-command-window.c:466
+msgid "Enter command:"
+msgstr "Voer opdracht in:"
+
+#: ../src/hid/gtk/gui-config.c:883
+msgid "Enables"
+msgstr "Activeer"
+
+#: ../src/hid/gtk/gui-config.c:888
+msgid "Use separate window for command entry"
+msgstr "Gebruik afzonderlijke vensters voor opdracht invoer"
+
+#: ../src/hid/gtk/gui-config.c:893
+msgid "Alternate window layout to allow smaller horizontal size"
+msgstr "Wissel venster opmaak voor een kleinere horizontale afmeting"
+
+#: ../src/hid/gtk/gui-config.c:898
+msgid "Alternate window layout to allow smaller vertical size"
+msgstr "Wissel venster opmaak voor een kleinere verticale afmeting"
+
+#: ../src/hid/gtk/gui-config.c:903
+msgid "Put layout name on the window title bar"
+msgstr "Plaats de opmaak naam in de title van het venster"
+
+#: ../src/hid/gtk/gui-config.c:905
+msgid "Backups"
+msgstr "Reserverkopie"
+
+#: ../src/hid/gtk/gui-config.c:909
+#, c-format
+msgid "If layout is modified at exit, save into PCB.%i.save"
+msgstr "Als bij het afsluiten de opmaak gewijzigd is, sla op in PCB.%i.save"
+
+#: ../src/hid/gtk/gui-config.c:912
+msgid ""
+"Seconds between auto backups\n"
+"(set to zero to disable auto backups)"
+msgstr ""
+"Seconden tussen automatisch reservekopie maken\n"
+"(zet op nul om het maken van reservekopieen uit te schakelen)"
+
+#: ../src/hid/gtk/gui-config.c:915
+msgid "Misc"
+msgstr "Div"
+
+#: ../src/hid/gtk/gui-config.c:919
+msgid "Number of commands to remember in the history list"
+msgstr "Aantal opdrachten om te onthouden in de geschiedenis lijst"
+
+#: ../src/hid/gtk/gui-config.c:923
+msgid "Auto pan speed"
+msgstr "Auto schuif snelheid"
+
+#: ../src/hid/gtk/gui-config.c:1021
+#: ../src/hid/gtk/gui-dialog-size.c:173
+#, c-format
+msgid "<b>%s</b> grid units are selected"
+msgstr "<b>%s</b> raster eenheden zijn geselecteerd"
+
+#: ../src/hid/gtk/gui-config.c:1022
+#: ../src/hid/gtk/gui-config.c:1186
+#: ../src/hid/gtk/gui-dialog-size.c:174
+msgid "mm"
+msgstr "mm"
+
+#: ../src/hid/gtk/gui-config.c:1022
+#: ../src/hid/gtk/gui-config.c:1186
+#: ../src/hid/gtk/gui-dialog-size.c:174
+msgid "mil"
+msgstr "mil"
+
+#. ---- Board Size ----
+#: ../src/hid/gtk/gui-config.c:1032
+msgid "Board Size"
+msgstr "Printplaat Afmetingen"
+
+#: ../src/hid/gtk/gui-config.c:1048
+msgid "Width"
+msgstr "Breedte"
+
+# FIXME: this should be changed to "Length" if and when 3D geometrical GUIs, 3D-exporters, 3D-printers emerge or are used.
+#: ../src/hid/gtk/gui-config.c:1055
+msgid "Height"
+msgstr "Hoogte"
+
+#: ../src/hid/gtk/gui-config.c:1059
+msgid "Use this board size as the default for new layouts"
+msgstr "Gebruik deze printplaat afmetingen als standaard voor nieuwe opmaken"
+
+#. ---- Text Scale ----
+#: ../src/hid/gtk/gui-config.c:1062
+msgid "Text Scale"
+msgstr "Tekst Schaal"
+
+#. ---- DRC Sizes ----
+#: ../src/hid/gtk/gui-config.c:1080
+msgid "Design Rule Checking"
+msgstr "Ontwerp Regel Controle"
+
+#: ../src/hid/gtk/gui-config.c:1095
+msgid "Minimum copper spacing"
+msgstr "Minimum koper afstand"
+
+#: ../src/hid/gtk/gui-config.c:1103
+msgid "Minimum copper width"
+msgstr "Minimum koper breedte"
+
+#: ../src/hid/gtk/gui-config.c:1111
+msgid "Minimum touching copper overlap"
+msgstr "Minimum overlap overlappend koper"
+
+#: ../src/hid/gtk/gui-config.c:1119
+msgid "Minimum silk width"
+msgstr "Minimum opdruk breedte"
+
+#: ../src/hid/gtk/gui-config.c:1127
+msgid "Minimum drill diameter"
+msgstr "Minimum boor diameter"
+
+#: ../src/hid/gtk/gui-config.c:1135
+msgid "Minimum annular ring"
+msgstr "Minimum annulaire ring"
+
+#: ../src/hid/gtk/gui-config.c:1140
+msgid "Use DRC values as the default for new layouts"
+msgstr "Gebruik DRC waarden als de standaard voor nieuwe opmaken"
+
+#: ../src/hid/gtk/gui-config.c:1185
+#, c-format
+msgid "Increment/Decrement values to use in <b>%s</b> units mode.\n"
+msgstr "Vergroot/Verklein waarden om in <b>%s</b> eenheden modus te gebruiken.\n"
+
+#: ../src/hid/gtk/gui-config.c:1197
+msgid "Grid Increment/Decrement"
+msgstr "Raster Vergroten/Verkleinen"
+
+#: ../src/hid/gtk/gui-config.c:1214
+msgid "For 'g' and '<shift>g' grid change actions"
+msgstr "Voor 'g' en '<shift>g' raster wijzig acties"
+
+#: ../src/hid/gtk/gui-config.c:1219
+msgid "Size Increment/Decrement"
+msgstr "Afmeting Vergroten/Verkleinen"
+
+#: ../src/hid/gtk/gui-config.c:1236
+msgid ""
+"For 's' and '<shift>s' size change actions on lines,\n"
+"pads, pins and text.\n"
+"Use '<ctrl>s' and '<shift><ctrl>s' for drill holes."
+msgstr ""
+"Voor 's' en '<shift>s' afmeting wijzig acties voor lijnen,\n"
+"pads, pennen en tekst.\n"
+"Gebruik '<ctrl>s' en '<shift><ctrl>s' voor boorgaten."
+
+#: ../src/hid/gtk/gui-config.c:1242
+msgid "Line Increment/Decrement"
+msgstr "Lijn Vergroten/Verkleinen"
+
+#: ../src/hid/gtk/gui-config.c:1261
+msgid "For 'l' and '<shift>l' routing line width change actions"
+msgstr "Voor 'l' en '<shift>l' routing lijn breedte wijzig acties"
+
+#: ../src/hid/gtk/gui-config.c:1265
+msgid "Clear Increment/Decrement"
+msgstr "Wis Vergroten/Verkleinen"
+
+#: ../src/hid/gtk/gui-config.c:1285
+msgid ""
+"For 'k' and '<shift>k' line clearance inside polygon size\n"
+"change actions"
+msgstr ""
+"Voor 'k' en '<shift>k' lijn vrijloop binnen polygoon afmeting\n"
+"wijzig acties"
+
+#: ../src/hid/gtk/gui-config.c:1310
+msgid "Element Directories"
+msgstr "Element bestandsmappen"
+
+#: ../src/hid/gtk/gui-config.c:1316
+msgid "<small>Enter a \""
+msgstr "<small>Voer een \""
+
+#: ../src/hid/gtk/gui-config.c:1357
+msgid "<h>Layer Names\n"
+msgstr "<h>Laag Namen\n"
+
+#: ../src/hid/gtk/gui-config.c:1358
+msgid ""
+"You may enter layer names for the layers drawn on the screen.\n"
+"The special 'component side' and 'solder side' are layers which\n"
+"will be printed out, so they must have in their group at least one\n"
+"of the other layers that are drawn on the screen.\n"
+msgstr ""
+"Je kunt laagnamen invoeren voor lagen die op het scherm getekend zijn.\n"
+"De speciale 'component side' en 'solder side' zijn lagen welke\n"
+"worden afgedrukt, dus deze moeten minstens een van de andere lagen die\n"
+"op het scherm getekend zijn in hun groep hebben\n"
+
+#: ../src/hid/gtk/gui-config.c:1363
+msgid "<h>Layer Groups\n"
+msgstr "<h>Laag Groepen\n"
+
+#: ../src/hid/gtk/gui-config.c:1364
+msgid ""
+"Each layer on the screen may be in its own group which allows the\n"
+"maximum number of board layers. However, for boards with fewer\n"
+"layers, you may group layers together which will then print as a\n"
+"single layer on a printout. This allows a visual color distinction\n"
+"to be displayed on the screen for signal groups which will print as\n"
+"a single layer\n"
+msgstr ""
+"Elke laag op het scherm kan in een eigen groep geplaatst worden,\n"
+"het welke het maximum aantal printlagen toestaat. Hoewel, voor\n"
+"printen met minder lagen, kun je lagen samen groeperen die dan\n"
+"als enkele laag op een afdruk komen. Dit laat toe dat verschillende\n"
+"signaal groepen met zichtbare kleuren op het scherm\n"
+"onderscheiden kunnen worden\n"
+
+#: ../src/hid/gtk/gui-config.c:1371
+msgid ""
+"For example, for a 4 layer board a useful layer group arrangement\n"
+"can be to have 3 screen displayed layers grouped into the same group\n"
+"as the 'component side' and 'solder side' printout layers. Then\n"
+"groups such as signals, ground, and supply traces can be color\n"
+"coded on the screen while printing as a single layer. For this\n"
+"you would select buttons and enter names on the Setup page to\n"
+"structure four layer groups similar to this:\n"
+msgstr ""
+"Als voorbeeld, voor een 4 lagen print kan een zinvol lagengroep ordening\n"
+"3 op het scherm getoonde lagen gegroupeerd in dezelfde groep\n"
+"als de 'component side' en 'solder side' afdruk lagen. Dan\n"
+"groepen zoals signalen, aarde, en voeding sporen kunnen met kleur\n"
+"gecodeerd op het scherm terwijl afgedrukt als een ekele laag. Voor dit\n"
+"Zou jij knoppen selecteren en namen invoeren op de Setup pagina voor\n"
+"een struktuur met vier laag groepen gelijkend op deze:\n"
+
+#: ../src/hid/gtk/gui-config.c:1379
+msgid "<b>Group 1:"
+msgstr "<b>Groep 1:"
+
+#: ../src/hid/gtk/gui-config.c:1381
+#: ../src/hid/gtk/gui-misc.c:512
+#: ../src/hid/gtk/gui-misc.c:536
+msgid "solder"
+msgstr "soldeer"
+
+#: ../src/hid/gtk/gui-config.c:1383
+msgid "GND-solder"
+msgstr "Aarde-soldeer"
+
+#: ../src/hid/gtk/gui-config.c:1385
+msgid "Vcc-solder"
+msgstr "Voeding-soldeer"
+
+#: ../src/hid/gtk/gui-config.c:1387
+#: ../src/hid/gtk/gui-config.c:1639
+msgid "solder side"
+msgstr "soldeer zijde"
+
+#: ../src/hid/gtk/gui-config.c:1389
+msgid "<b>Group 2:"
+msgstr "<b>Groep 2:"
+
+#: ../src/hid/gtk/gui-config.c:1391
+#: ../src/hid/gtk/gui-misc.c:512
+#: ../src/hid/gtk/gui-misc.c:536
+msgid "component"
+msgstr "komponent"
+
+#: ../src/hid/gtk/gui-config.c:1393
+msgid "GND-component"
+msgstr "Aarde-komponent"
+
+#: ../src/hid/gtk/gui-config.c:1395
+msgid "Vcc-component"
+msgstr "Voeding-komponent"
+
+#: ../src/hid/gtk/gui-config.c:1397
+#: ../src/hid/gtk/gui-config.c:1637
+msgid "component side"
+msgstr "komponent zijde"
+
+#: ../src/hid/gtk/gui-config.c:1399
+msgid "<b>Group 3:"
+msgstr "<b>Groep 3:"
+
+#: ../src/hid/gtk/gui-config.c:1401
+msgid "signal1"
+msgstr "signaal1"
+
+#: ../src/hid/gtk/gui-config.c:1403
+msgid "<b>Group 4:"
+msgstr "<b>Groep 4:"
+
+#: ../src/hid/gtk/gui-config.c:1405
+msgid "signal2"
+msgstr "signaal2"
+
+#: ../src/hid/gtk/gui-config.c:1519
+msgid ""
+"Both 'solder side' or 'component side' layers must have at least\n"
+"\tone other layer in their group.\n"
+msgstr ""
+"Zowel 'soldeer zijde' als 'komponent zijde' lagen moeten tenminste\n"
+"\teen andere laag in hun groep hebben.\n"
+
+#: ../src/hid/gtk/gui-config.c:1526
+msgid ""
+"The 'solder side' and 'component side' layers are not allowed\n"
+"\tto be in the same layer group #\n"
+msgstr ""
+"De 'soldeer zijde' en 'komponent zijde' lagen mogen niet in\n"
+"\tdezelfde lagengroep #\n"
+
+#. working copy
+#. So can know if PCB changes on us
+#: ../src/hid/gtk/gui-config.c:1617
+msgid "Group #"
+msgstr "Groep #"
+
+#. -- Change tab
+#: ../src/hid/gtk/gui-config.c:1705
+msgid "Change"
+msgstr "Verandering"
+
+#: ../src/hid/gtk/gui-config.c:1707
+msgid "Operations on currently selected layer:"
+msgstr "Handelingen op huidige geselecteerde laag:"
+
+#: ../src/hid/gtk/gui-config.c:1736
+msgid "Add new layer above currently selected layer:"
+msgstr "Voeg nieuwe laag boven de huidige geselecteerde laag toe:"
+
+#. -- Groups tab
+#: ../src/hid/gtk/gui-config.c:1746
+msgid "Groups"
+msgstr "Groepen"
+
+#. -- Info tab
+#: ../src/hid/gtk/gui-config.c:1762
+msgid "Info"
+msgstr "Info"
+
+#: ../src/hid/gtk/gui-config.c:1811
+#, c-format
+msgid "Current colors loaded: <b>%s</b>"
+msgstr "Huidige geladen kleuren: <b>%s</b>"
+
+#: ../src/hid/gtk/gui-config.c:1856
+msgid "Load Color File"
+msgstr "Laad Kleur Bestand"
+
+#: ../src/hid/gtk/gui-config.c:1885
+msgid "Save Color File"
+msgstr "Sla Kleur Bestand op"
+
+#: ../src/hid/gtk/gui-config.c:1891
+msgid "Sorry, not overwriting the default color file!"
+msgstr "Sorry, het standaard kleur bestand niet overschreven!"
+
+#: ../src/hid/gtk/gui-config.c:1945
+#, c-format
+msgid "PCB %s Color"
+msgstr "PCB %s Kleur"
+
+#. ---- Main colors ----
+#: ../src/hid/gtk/gui-config.c:1975
+msgid "Main colors"
+msgstr "Hoofd kleuren"
+
+#. ---- Layer colors ----
+#: ../src/hid/gtk/gui-config.c:1990
+msgid "Layer colors"
+msgstr "Laag kleuren"
+
+#. ---- Selected colors ----
+#: ../src/hid/gtk/gui-config.c:2005
+msgid "Selected colors"
+msgstr "Geselecteerde kleuren"
+
+#: ../src/hid/gtk/gui-config.c:2031
+msgid "<b>Warning:</b> unsaved color changes will be lost at program exit."
+msgstr "<b>Waarschuwing:</b> niet opgeslagen kleur veranderingen zullen verloren gaan bij programma einde."
+
+#: ../src/hid/gtk/gui-config.c:2046
+msgid "Load"
+msgstr "Laad"
+
+#: ../src/hid/gtk/gui-config.c:2049
+msgid "Save"
+msgstr "Opslaan"
+
+#: ../src/hid/gtk/gui-config.c:2051
+msgid "Defaults"
+msgstr "Defaults"
+
+#: ../src/hid/gtk/gui-config.c:2091
+msgid "<b>mm</b> "
+msgstr "<b>mm</b> "
+
+#: ../src/hid/gtk/gui-config.c:2091
+msgid "<b>mil</b> "
+msgstr "<b>mil</b> "
+
+#: ../src/hid/gtk/gui-config.c:2183
+msgid "PCB Preferences"
+msgstr "PCB Instellingen"
+
+#: ../src/hid/gtk/gui-config.c:2208
+msgid "General"
+msgstr "Algemeen"
+
+#. XXX not used yet
+#: ../src/hid/gtk/gui-config.c:2215
+#: ../src/hid/gtk/gui-dialog-size.c:190
+msgid "Sizes"
+msgstr "Afmetingen"
+
+#: ../src/hid/gtk/gui-config.c:2221
+msgid "Increments"
+msgstr "Stappen"
+
+#: ../src/hid/gtk/gui-config.c:2227
+msgid "Library"
+msgstr "Bibliotheek"
+
+#: ../src/hid/gtk/gui-config.c:2233
+msgid "Layers"
+msgstr "Lagen"
+
+#: ../src/hid/gtk/gui-config.c:2240
+msgid "Colors"
+msgstr "Kleuren"
+
+#. non-zero means cancel was picked
+#: ../src/hid/gtk/gui-dialog-print.c:342
+msgid "PCB Print Layout"
+msgstr "PCB Print Opmaak"
+
+#: ../src/hid/gtk/gui-dialog-print.c:374
+msgid "PCB Export Layout"
+msgstr "PCB Export Opmaak"
+
+#: ../src/hid/gtk/gui-dialog-print.c:410
+msgid "Can't find a suitable exporter HID"
+msgstr "Kan geen geschikte exporteer HID vinden"
+
+#: ../src/hid/gtk/gui-dialog-size.c:160
+#, c-format
+msgid "%s Sizes"
+msgstr "%s Afmetingen"
+
+#: ../src/hid/gtk/gui-dialog-size.c:183
+msgid "Route style name"
+msgstr "Route stijl naam"
+
+#: ../src/hid/gtk/gui-dialog-size.c:202
+msgid "Line width"
+msgstr "Lijn breedte"
+
+#: ../src/hid/gtk/gui-dialog-size.c:209
+msgid "Via hole"
+msgstr "Via gat"
+
+#: ../src/hid/gtk/gui-dialog-size.c:216
+msgid "Via size"
+msgstr "Via afmeting"
+
+#: ../src/hid/gtk/gui-dialog-size.c:222
+msgid "Clearance"
+msgstr "Vrijloop"
+
+#: ../src/hid/gtk/gui-dialog-size.c:227
+msgid "Temporary Styles"
+msgstr "Tijdelijke Stijlen"
+
+#: ../src/hid/gtk/gui-dialog-size.c:231
+#, c-format
+msgid "<small>Use values in a temporary route style instead of <b>%s</b>.</small>"
+msgstr "<small>Gebruik waarden in een tijdelijke route stijl in plaats van <b>%s</b>.</small>"
+
+#: ../src/hid/gtk/gui-dialog-size.c:241
+msgid "Temp1"
+msgstr "Temp1"
+
+#: ../src/hid/gtk/gui-dialog-size.c:244
+msgid "Temp2"
+msgstr "Temp2"
+
+#: ../src/hid/gtk/gui-dialog-size.c:246
+msgid "Default Style"
+msgstr "Standaard Stijl"
+
+#: ../src/hid/gtk/gui-dialog-size.c:249
+#, c-format
+msgid "<small>Use values as the default route style for new layouts.</small>"
+msgstr "<small>Gebruik waarden voor de standaard route stijl voor nieuwe opmaken.</small>"
+
+#: ../src/hid/gtk/gui-dialog-size.c:257
+msgid "Set as default"
+msgstr "Stel in als standaard"
+
+#: ../src/hid/gtk/gui-dialog.c:209
+#, c-format
+msgid "Save the changes to layout before closing?"
+msgstr "Opslaan van veranderingen van de opmaak voor het afsluiten?"
+
+#: ../src/hid/gtk/gui-dialog.c:212
+#, c-format
+msgid "Save the changes to layout \"%s\" before closing?"
+msgstr "De veranderingen opslaan naar opmaak \"%s\" voor het afsluiten?"
+
+#: ../src/hid/gtk/gui-dialog.c:217
+msgid "If you don't save, all your changes will be permanently lost."
+msgstr "Als je niet opslaat, zullen alle veranderingen permanent verloren gaan."
+
+#: ../src/hid/gtk/gui-dialog.c:227
+msgid "Close _without saving"
+msgstr "Afsluiten _zonder opslaan"
+
+#: ../src/hid/gtk/gui-drc-window.c:228
+#, c-format
+msgid "Object ID %i identified during DRC was not found. Stale DRC window?\n"
+msgstr "Object ID %i geidentificeerd tijdens DRC was niet gevonden. Verlopen DRC venster?\n"
+
+#: ../src/hid/gtk/gui-drc-window.c:896
+msgid "PCB DRC"
+msgstr "PCB DRC"
+
+#. APPEND
+#: ../src/hid/gtk/gui-drc-window.c:930
+msgid "No."
+msgstr "Nr."
+
+#. APPEND
+#: ../src/hid/gtk/gui-drc-window.c:938
+msgid "Violation details"
+msgstr "Overtreding details"
+
+#: ../src/hid/gtk/gui-keyref-window.c:48
+msgid "Keyboard\n"
+msgstr "Toetsenbord\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:49
+msgid "Keyboard shortcuts and actions available in PCB.\n"
+msgstr "Toetsenbord snelkoppelingen en acties beschikbaar in PCB.\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:50
+msgid "In below key actions, <s> is <shift>, <c> is <ctrl>\n"
+msgstr "In onderstaande toets acties, <s> is <shift>, <c> is <ctrl>\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:51
+msgid "and <a> is <alt> or <mod>\n"
+msgstr "en <a> is <alt> of <mod>\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:55
+msgid "Set layer and size from line or arc\n"
+msgstr "Neem laag en afmeting over van lijn of boog\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:59
+msgid "Unselect all objects\n"
+msgstr "Deselecteer alle objecten\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:63
+msgid "Flip element to opposite side of the board\n"
+msgstr "Verplaats element naar tegenovergestelde zijde van het bord\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:65
+msgid "Flip selected objects to opposite side of the board\n"
+msgstr "Verplaats geselecteerde objecten naar tegenovergestelde zijde van het bord\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:69
+msgid "Copy selected to buffer and unselect\n"
+msgstr "Kopieer het geselecteerde naar de buffer en deselecteer\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:73
+msgid "Display pin/pad names (numbers with View->Enable pinout shows number)\n"
+msgstr "Toon pen/pad namen (nummers met Zien->Activeren pinout toont nummer)\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:75
+msgid "Open pinout window for element under cursor\n"
+msgstr "Open pinout venster voor het element onder de aanwijzer\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:79
+msgid "Delete all rats\n"
+msgstr "Verwijder alle ratlijnen\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:81
+msgid "Delete selected rats\n"
+msgstr "Verwijder geselecteerde ratlijnen\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:85
+msgid "Highlight connections to object\n"
+msgstr "Laat verbinding met object oplichten\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:87
+msgid "Reset highlighted connections\n"
+msgstr "Oplichtende verbindingen terugzetten\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:89
+msgid "Cumulative highlight connections to object\n"
+msgstr "Laat cumulatieve verbindingen naar objecten oplichten\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:93
+msgid "Increment grid by configured grid increment\n"
+msgstr "Vergroot raster met de geconfigureerde toename\n"
+
+# FIXME: original string needs correction.
+# "Decrement grid by configured grid decrement\n"
+#: ../src/hid/gtk/gui-keyref-window.c:96
+msgid "Decrement grid by configured grid increment\n"
+msgstr "Verklein raster met de geconfigureerde afname\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:100
+msgid "Toggle visibility of element name under cursor\n"
+msgstr "Schakel de zichtbaarheid van element onder de aanwijzer\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:103
+msgid "Toggle visibility of selected element names\n"
+msgstr "Schakel de zichtbaarheid van geselecteerde elementnamen\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:106
+msgid "Toggle the hole flag of object under cursor\n"
+msgstr "Schakel de gat-vlag van het object onder de aanwijzer\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:110
+msgid "Toggle line/arc should clear polygons flag of object under cursor\n"
+msgstr "Schakel lijn/boog zou de polygoon-vlag moeten wissen van het object onder de aanwijzer\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:113
+msgid "Toggle line/arc should clear polygons flag of selected\n"
+msgstr "Schakel lijn/boog zou de polygoon-vlag moeten wissen van het geselecteerde\n"
+
+# FIXME: original string has room for improvement.
+# "Increase clearance of object by configured value\n"
+#: ../src/hid/gtk/gui-keyref-window.c:117
+msgid "Increase clearance of object by configured clearance\n"
+msgstr "Vergroot vrijloop met de geconfigureerde vrijloop\n"
+
+# FIXME: original string has room for improvement.
+# "Decrease clearance of object by configured value\n"
+#: ../src/hid/gtk/gui-keyref-window.c:120
+msgid "Decrease clearance of object by configured clearance\n"
+msgstr "Verklein vrijloop met de geconfigureerde vrijloop\n"
+
+# FIXME: original string has room for improvement.
+# "Increase clearance of selected objects by configured value\n"
+#: ../src/hid/gtk/gui-keyref-window.c:123
+msgid "Increase clearance of selected objects by configured clearance\n"
+msgstr "Vergroot vrijloop van geselecteerde objecten met de geconfigureerde vrijloop\n"
+
+# FIXME: original string has room for improvement.
+# "Decrease clearance of selected objects by configured value\n"
+#: ../src/hid/gtk/gui-keyref-window.c:126
+msgid "Decrease clearance of selected objects by configured clearance\n"
+msgstr "Verklein vrijloop van geselecteerde objecten met de geconfigureerde vrijloop\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:130
+msgid "Increment current route style line size by configured line increment\n"
+msgstr "Vergroot huidige route stijl lijn maat met de geconfigureerde toename\n"
+
+# FIXME: original string needs correction.
+# "Decrement current route style line size by configured value\n"
+#: ../src/hid/gtk/gui-keyref-window.c:133
+msgid "Decrement current route style line size by configured line increment\n"
+msgstr "Verklein huidige route stijl lijn maat met de geconfigureerde toename\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:137
+msgid "Move object to current layer\n"
+msgstr "Verplaats object naar huidige laag\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:140
+msgid "Move selected objects to current layer\n"
+msgstr "Verplaats geselecteerd object naar huidige laag\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:143
+msgid "Mark at cursor location for showing relative offsets\n"
+msgstr "Mer op aanwijzer lokatie voor het tonen van relatieve offsets\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:147
+msgid "Select the shortest unselected rat on the board\n"
+msgstr "Selecteer de kortste ongeselecteerde ratlijn op het bord\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:151
+msgid "Optimize and draw all rats\n"
+msgstr "Optimaliseer en teken alle ratlijnen\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:154
+msgid "Optimize and draw selected rats\n"
+msgstr "Optimaliseer en teken geselecteerde ratlijnen\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:158
+msgid "Change octagon flag of object\n"
+msgstr "Verander achthoek vlag van een object\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:162
+msgid "Backup polygon drawing to previous point\n"
+msgstr "Zet polygoon tekenen terug naar vorig punt\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:165
+msgid "Close polygon\n"
+msgstr "Sluit polygoon\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:169
+msgid "Toggle the square flag of an object\n"
+msgstr "Schakel de vierkant vlag van een object\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:173
+msgid "Redo last undone operation\n"
+msgstr "Herstel laatste ongedaan gemaakte handeling\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:177
+msgid "Increment size of an object by configured size increment\n"
+msgstr "Vergroot de afmetingen van een object met een ingestelde hoeveelheid\n"
+
+# FIXME: original string needs correction.
+# "Decrement size of an object by configured size decrement\n"
+#: ../src/hid/gtk/gui-keyref-window.c:179
+msgid "Decrement size of an object by configured size increment\n"
+msgstr "Verklein de afmetingen van een object met een ingestelde hoeveelheid\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:181
+msgid "Increment drill size of a pin or via\n"
+msgstr "Vergroot de boormaat van een pen of via\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:183
+msgid "Decrement drill size of a pin or via\n"
+msgstr "Verklein de boormaat van een pen of via\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:187
+msgid "Adjust text scale so new text increases by the configured size increment\n"
+msgstr "Verstel tekstschaal opdat nieuwe tekst vergroot met de ingestelde grootte verhoging\n"
+
+# increment is to be replaced with decrement
+#: ../src/hid/gtk/gui-keyref-window.c:189
+msgid "Adjust text scale so new text decreases by the configured size increment\n"
+msgstr "Verstel tekstschaal opdat nieuwe tekst verkleind met de ingestelde grootte verhoging\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:193
+msgid "Undo last operation\n"
+msgstr "Maak laatste handeling ongedaan\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:197
+msgid "Zoom to board extents\n"
+msgstr "Verschaal naar bord omvang\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:199
+msgid "Increment current route style via size\n"
+msgstr "Vergroot via afmetingen huidige route stijl\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:201
+msgid "Decrement current route style via size\n"
+msgstr "Verklein via afmetingen huidige route stijl\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:203
+msgid "Increment current route style via hole size\n"
+msgstr "Vergroot gat afmetingen huidige route stijl\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:205
+msgid "Decrement current route style via hole size\n"
+msgstr "Verklein gat afmetingen huidige route stijl\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:209
+msgid "Copy selection to buffer and enter pastebuffer mode\n"
+msgstr "Kopieer selektie naar buffer en ga in plakbuffer modus\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:211
+msgid "Cut selection to buffer and enter pastebuffer mode\n"
+msgstr "Knip selektie naar buffer en ga in plakbuffer modus\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:215
+msgid "Zoom in\n"
+msgstr "Vergroot in\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:217
+msgid "Zoom out\n"
+msgstr "Vergroot uit\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:221
+msgid "Toggle thin draw mode\n"
+msgstr "Schakel dun tekenen mous\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:225
+msgid "Cycle multiline mode (Using <s> overrides)\n"
+msgstr "Ronddraaien door meervoudigelijn modus (Gebruik <s> overschrijven)\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:229
+msgid "Toggle all direction lines mode\n"
+msgstr "Schakel lijnen in alle richtingen modus\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:233
+msgid "If drawing an object, return to a neutral state.\n"
+msgstr "Als een objekt getekend wordt, ga terug naar een neutrale staat.\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:237
+msgid "Switch view to other side\n"
+msgstr "Schakel venster naar andere zijde\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:241
+msgid "Switch to select mode\n"
+msgstr "Schakel naar selekteer modus\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:245
+msgid "Enter user command or pop up command window\n"
+msgstr "Voer een gebruikerscommando in of een opduikend opdrachtvenster\n"
+
+#: ../src/hid/gtk/gui-keyref-window.c:249
+msgid "Delete object\n"
+msgstr "Verwijder object\n"
+
+#: ../src/hid/gtk/gui-keyref-w...
[truncated message content] |
|
From: <gi...@gp...> - 2011-03-12 23:19:02
|
The branch, master has been updated
via 08805bad16c623f5e1a1878f19ec085d306faec7 (commit)
from 8611315f3670050fd350fb8987502aecc3acb3f2 (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-library-window.c | 49 ++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
=================
Commit Messages
=================
commit 08805bad16c623f5e1a1878f19ec085d306faec7
Author: Krzysztof Kosciuszkiewicz <k.k...@gm...>
Commit: Krzysztof KoÅciuszkiewicz <k.k...@gm...>
hid/gtk: handle CTRL-C in library window
Handle CTRL-C keypress in library window and copy name of the selected
component into the default GTK clipboard.
The change facilitates workflow where one browses footprints in pcb and
copies component names into gattrib or gschem.
:100644 100644 eb366ba... b101576... M src/hid/gtk/gui-library-window.c
=========
Changes
=========
commit 08805bad16c623f5e1a1878f19ec085d306faec7
Author: Krzysztof Kosciuszkiewicz <k.k...@gm...>
Commit: Krzysztof KoÅciuszkiewicz <k.k...@gm...>
hid/gtk: handle CTRL-C in library window
Handle CTRL-C keypress in library window and copy name of the selected
component into the default GTK clipboard.
The change facilitates workflow where one browses footprints in pcb and
copies component names into gattrib or gschem.
diff --git a/src/hid/gtk/gui-library-window.c b/src/hid/gtk/gui-library-window.c
index eb366ba..b101576 100644
--- a/src/hid/gtk/gui-library-window.c
+++ b/src/hid/gtk/gui-library-window.c
@@ -63,6 +63,8 @@
#include "data.h"
#include "set.h"
+#include <gdk/gdkkeysyms.h>
+
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
@@ -304,6 +306,48 @@ tree_row_activated (GtkTreeView *tree_view,
gtk_tree_view_expand_row (tree_view, path, FALSE);
}
+/*! \brief Handles CTRL-C keypress in the TreeView
+ * \par Function Description
+ * Keypress activation handler:
+ * If CTRL-C is pressed, copy footprint name into the clipboard.
+ *
+ * \param [in] tree_view The component treeview.
+ * \param [in] event The GdkEventKey with keypress info.
+ * \param [in] user_data Not used.
+ * \return TRUE if CTRL-C event was handled, FALSE otherwise.
+ */
+static gboolean
+tree_row_key_pressed (GtkTreeView *tree_view,
+ GdkEventKey *event,
+ gpointer user_data)
+{
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkClipboard *clipboard;
+ const gchar *compname;
+ guint default_mod_mask = gtk_accelerator_get_default_mod_mask();
+
+ /* Handle both lower- and uppercase `c' */
+ if (((event->state & default_mod_mask) != GDK_CONTROL_MASK)
+ || ((event->keyval != GDK_c) && (event->keyval != GDK_C)))
+ return FALSE;
+
+ selection = gtk_tree_view_get_selection (tree_view);
+ g_return_val_if_fail (selection != NULL, TRUE);
+
+ if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+ return TRUE;
+
+ gtk_tree_model_get (model, &iter, MENU_NAME_COLUMN, &compname, -1);
+
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ g_return_val_if_fail (clipboard != NULL, TRUE);
+
+ gtk_clipboard_set_text (clipboard, compname, -1);
+
+ return TRUE;
+}
/*! \brief Handles changes in the treeview selection.
* \par Function Description
@@ -606,6 +650,11 @@ create_lib_treeview (GhidLibraryWindow * library_window)
G_CALLBACK (tree_row_activated),
NULL);
+ g_signal_connect (libtreeview,
+ "key-press-event",
+ G_CALLBACK (tree_row_key_pressed),
+ NULL);
+
/* connect callback to selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (libtreeview));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
|
|
From: <gi...@gp...> - 2011-03-12 15:19:24
|
The branch, master has been updated
via 8611315f3670050fd350fb8987502aecc3acb3f2 (commit)
from 3113b530caeeee28727ff9cf25638ff2c1c1414c (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 | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
=================
Commit Messages
=================
commit 8611315f3670050fd350fb8987502aecc3acb3f2
Author: Felix Ruoff <Fe...@po...>
Commit: Ineiev <in...@us...>
Describe layer groupings in GTK+ GUI
Add information to the documentation where the 'Edit Layer Grouping'
option can be found in the GTK+ GUI.
Closes-bug: lp-699175
:100644 100644 efd6b9f... 3c5b1e2... M doc/pcb.texi
=========
Changes
=========
commit 8611315f3670050fd350fb8987502aecc3acb3f2
Author: Felix Ruoff <Fe...@po...>
Commit: Ineiev <in...@us...>
Describe layer groupings in GTK+ GUI
Add information to the documentation where the 'Edit Layer Grouping'
option can be found in the GTK+ GUI.
Closes-bug: lp-699175
diff --git a/doc/pcb.texi b/doc/pcb.texi
index efd6b9f..3c5b1e2 100644
--- a/doc/pcb.texi
+++ b/doc/pcb.texi
@@ -1088,8 +1088,9 @@ layers in the same group reside on the same physical layer of
the actual board. Notice that this example has 2 groups each having
3 layers, plus two other layers named @samp{unused}.
Use the @samp{Edit layer groups} option in the @samp{Settings} menu to
-change the layer groupings. Note that changing the groupings can
-radically alter the connectivity on the board.
+change the layer groupings in the lesstif GUI or the @samp{Preferences}
+dialog from the @samp{File} menu in the GTK+ GUI. Note that changing the
+groupings can radically alter the connectivity on the board.
Grouping layers is only useful for helping you to color-code
signals in your layout. Note that grouping layers actually reduces the number
of different physical layers available for your board, so to make an eight
|
|
From: <gi...@gp...> - 2011-03-07 05:43:33
|
The branch, master has been updated
via 3113b530caeeee28727ff9cf25638ff2c1c1414c (commit)
from 155d8c6b3b617ea6e5999ee7dbbf0bd56ec2be27 (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 | 109 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 86 insertions(+), 23 deletions(-)
=================
Commit Messages
=================
commit 3113b530caeeee28727ff9cf25638ff2c1c1414c
Author: Kai-Martin Knaak <km...@li...>
Commit: Ineiev <in...@us...>
expand the regexp appendix in pcb manual
* Add special character "|" to concatenate
* Add special character $" to denote the end of a string
* Mention the special meaning of brackets.
* Make the table of examples conform to
"example -> description"
rather than the other way round.
* Add examples for the use of "|", "[]" and "{}".
Closes-bug: lp-723931
:100644 100644 cf3ceb1... efd6b9f... M doc/pcb.texi
=========
Changes
=========
commit 3113b530caeeee28727ff9cf25638ff2c1c1414c
Author: Kai-Martin Knaak <km...@li...>
Commit: Ineiev <in...@us...>
expand the regexp appendix in pcb manual
* Add special character "|" to concatenate
* Add special character $" to denote the end of a string
* Mention the special meaning of brackets.
* Make the table of examples conform to
"example -> description"
rather than the other way round.
* Add examples for the use of "|", "[]" and "{}".
Closes-bug: lp-723931
diff --git a/doc/pcb.texi b/doc/pcb.texi
index cf3ceb1..efd6b9f 100644
--- a/doc/pcb.texi
+++ b/doc/pcb.texi
@@ -5752,51 +5752,114 @@ Regular Expressions are supported by @pcb{} if the regex library was
available when @pcb{} was built. One difference from the regular
expressions found in tools like awk or grep is that PCB implicitly
adds a ``^'' to the begining of a regular expression and ``$'' to the
-end of the regular expression. For example if you enter ``C1'', the
-actual regular expression used internally is ``^C1$''.
-It is easier to show by example how to search than explain POSIX 1003.2. The following table shows the most common
-Regular Expression characters used to find elements in @pcb{}:
+end of the regular expression. For example, if you enter ``C1'', the
+actual regular expression used internally is ``^C1$''. Another difference
+is that search patterns in pcb are not case sensitive. That is, ``CON'' is
+treated the same as ``con''.
+
+It is easier to show by example how to search than explain
+POSIX 1003.2. With regular expressions most characters are just
+themselves, but some are special:
@table @samp
-@item \
-Indicates next character should not be interpreted literally if it
-normally is, and should be interpreted literally if it normally isn't.
@item *
Matches 0 or more instances of preceding character.
+
@item +
Matches 1 or more instances of preceding character.
+
@item ?
Matches 0 or 1 instances of preceding character.
+
@item .
Matches any single character other than the newline character.
+@item |
+The vertical vertical bar is the alternation operator. It combines two
+regular expressions. The result matches if either of them matches.
+
+@item \
+A backslash indicates the next character should not be interpreted literally
+if it normally is, and should be interpreted literally if it normally isn't.
+
+@item @{n@}
+An integer n enclosed in curly brackets matches the preceding item if
+it occurs exactly n times.
+
+@item [ ]
+A pair of square brackets matches every character they contain. Characters
+may be given explicitly, or as ranges.
+
+@item -
+A hyphen in the context of square brackets denotes the range between the
+preceding and the following character. E.g., the range of digits is
+``0-9'' . The range of letters from C to K is ``C-K'' .
+
+@item \^ inside square brackets
+Inside square brackets the caret is an anti operator. Its presence makes
+the square prackets match anything except the contents of the brackets.
+
+@item ( )
+Round parenthesis group parts of a regular expression. This is very much
+like they do in math formulars.
+
@end table
-The following examples illustrate how regular expressions are used to
+If you need a special character literally, you can escape it with a
+backslash.
+
+The following examples illustrate how regular expressions can be used to
specify element names (reference designators) to search for.
@table @samp
-@item Search for the element whose name is exactly ``C1''.
-Enter ``C1''.
+@item C5
+Select the element whose name is exactly ``C5''.
+
+@item C5 | R3
+Select C5 and R3.
+
+@item C.*
+Select all elements whose name start with the letter ``C'', such as C5, or
+C42, or CF1.
+
+@item C.*1
+Select all elements that start with ``C'' and end with ``1'', such as C1,
+or C51 or C5/9B71.
+
+@item R10?
+Search for R1 or R10, but will not select R100 or R105. The question mark
+is a quantifier for the character ``0''.
+
+@item R128+
+Selects R128, R1288, R12888, etc.
+
+@item TB.
+Select all terminal blocks having exactly one character designator after
+``TB'' such as TB1, TBA, or TBx but not TB.
+
+@item TB..
+Select all terminal blocks having a two character designator such as TB21 or
+TB1a.
-@item Search for all elements that start with ``C'', such as capacitors:
-Enter ``C.*''.
+@item TB.*
+Select all terminal blocks with any designator.
-@item Search for all elements that start with ``C'' and end with ``1'', such as ``C1'', or ``C51'':
-Enter ``C.*1''.
+@item .*31
+Select all items, whose name ends with ``31'' such as Q31, or R31, or R531.
-@item Search for only R1 or R10, will not match R100:
-Enter ``R10?''.
+@item Q[12]
+Select Q1 and Q2.
-@item Search for all parts starting with ``R12'' and ending with the number eight, or eighty-eight etc:
-Enter ``R128+''.
+@item [A-D].*
+Select all items, whose name starts with ``A'', ``B'', ``C'', or ``D''.
-@item Search for all terminal blocks having a one digit designator
-such as ``TB1'', ``TB2'', or ``TBx'':
-"TB.".
+@item .*N@{2@}.*
+Select all items, whose name contains two ``N'' in a row such as
+CONN23, or connA, but not CON5
-@item Search for all terminal blocks having a two digit designator such as TB21 or TB15:
-"TB..".
+@item [^D].*
+Select all items that do not start with the letter ``D'', such as C2, or
+R34, but not D34
@end table
|
|
From: <gi...@gp...> - 2011-02-28 21:57:14
|
The branch, master has been updated
via 155d8c6b3b617ea6e5999ee7dbbf0bd56ec2be27 (commit)
from 1d551f2fbe9dfba9b2e0d7e703ccc26200611635 (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/.gitignore | 1 +
tests/.gitignore | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
create mode 100644 tests/.gitignore
=================
Commit Messages
=================
commit 155d8c6b3b617ea6e5999ee7dbbf0bd56ec2be27
Author: Markus Hitter <ma...@ju...>
Commit: Peter Clifton <pc...@ca...>
Clean up "git status" output.
Closes-bug: lp-710719
:100644 100644 8e051a6... ab5a68e... M gts/.gitignore
:000000 100644 0000000... 03567fc... A tests/.gitignore
=========
Changes
=========
commit 155d8c6b3b617ea6e5999ee7dbbf0bd56ec2be27
Author: Markus Hitter <ma...@ju...>
Commit: Peter Clifton <pc...@ca...>
Clean up "git status" output.
Closes-bug: lp-710719
diff --git a/gts/.gitignore b/gts/.gitignore
index 8e051a6..ab5a68e 100644
--- a/gts/.gitignore
+++ b/gts/.gitignore
@@ -1,2 +1,3 @@
+*.[oa]
.dirstamp
predicates_init.h
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..03567fc
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1 @@
+outputs
|
|
From: <gi...@gp...> - 2011-02-26 10:45:10
|
The branch, master has been updated
via 1d551f2fbe9dfba9b2e0d7e703ccc26200611635 (commit)
from ec34fde7e5ca02e97d22039260d0ee69236e859b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
=================
Commit Messages
=================
commit 1d551f2fbe9dfba9b2e0d7e703ccc26200611635
Author: Stephen Ecob <sil...@gm...>
Commit: Ineiev <in...@us...>
better heuristics for paste openings
Prohibit paste windows wider than mask ones (suggested by Kai-Martin
Knaak).
Suppress zero width paste windows (suggested by DJ Delorie).
Discussed on
http://www.seul.org/pipermail/geda-user/2011-February/052413.html
Closes-bug: lp-718342
:100644 100644 1d8d462... 18d0dce... M src/draw.c
=========
Changes
=========
commit 1d551f2fbe9dfba9b2e0d7e703ccc26200611635
Author: Stephen Ecob <sil...@gm...>
Commit: Ineiev <in...@us...>
better heuristics for paste openings
Prohibit paste windows wider than mask ones (suggested by Kai-Martin
Knaak).
Suppress zero width paste windows (suggested by DJ Delorie).
Discussed on
http://www.seul.org/pipermail/geda-user/2011-February/052413.html
Closes-bug: lp-718342
diff --git a/src/draw.c b/src/draw.c
index 1d8d462..18d0dce 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -543,8 +543,13 @@ DrawEverything (BoxTypePtr drawn_area)
if ((TEST_FLAG (ONSOLDERFLAG, pad) && side == SOLDER_LAYER)
|| (!TEST_FLAG (ONSOLDERFLAG, pad)
&& side == COMPONENT_LAYER))
- if (!TEST_FLAG (NOPASTEFLAG, pad))
- DrawPadLowLevel (Output.fgGC, pad, false, false);
+ if (!TEST_FLAG (NOPASTEFLAG, pad) && pad->Mask > 0)
+ {
+ if (pad->Mask < pad->Thickness)
+ DrawPadLowLevel (Output.fgGC, pad, true, true);
+ else
+ DrawPadLowLevel (Output.fgGC, pad, false, false);
+ }
}
ENDALL_LOOP;
}
|
|
From: <gi...@gp...> - 2011-02-25 00:04:11
|
The branch, master has been updated
via ec34fde7e5ca02e97d22039260d0ee69236e859b (commit)
from 359a02cfe25e32aec7d2985c8f368fbfdcd954fa (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/autoroute.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
=================
Commit Messages
=================
commit ec34fde7e5ca02e97d22039260d0ee69236e859b
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Fix auto-router - we need to actually increment the dir variable!
Was broken accidentally in commit 5f0f788dc12a10a3c01ade7cf00d5ed63922ca47
(Initial C++ compatibility patch)
:100644 100644 b2cbab4... cecf9c0... M src/autoroute.c
=========
Changes
=========
commit ec34fde7e5ca02e97d22039260d0ee69236e859b
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Fix auto-router - we need to actually increment the dir variable!
Was broken accidentally in commit 5f0f788dc12a10a3c01ade7cf00d5ed63922ca47
(Initial C++ compatibility patch)
diff --git a/src/autoroute.c b/src/autoroute.c
index b2cbab4..cecf9c0 100644
--- a/src/autoroute.c
+++ b/src/autoroute.c
@@ -2817,7 +2817,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
* in clockwise order, which allows finding corners that can
* be expanded.
*/
- for (dir = NORTH; dir <= WEST; directionIncrement(dir))
+ for (dir = NORTH; dir <= WEST; dir = directionIncrement(dir))
{
/* don't break the edge we came from */
if (e->expand_dir != ((dir + 2) % 4))
@@ -2894,7 +2894,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
* moveable as possible.
*/
first = last = -1;
- for (dir = NORTH; dir <= WEST; directionIncrement(dir))
+ for (dir = NORTH; dir <= WEST; dir = directionIncrement(dir))
{
if (heap[dir] && !heap_is_empty (heap[dir]))
{
@@ -3057,7 +3057,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
}
}
/* done with all expansion edges of this box */
- for (dir = NORTH; dir <= WEST; directionIncrement(dir))
+ for (dir = NORTH; dir <= WEST; dir = directionIncrement(dir))
{
if (heap[dir])
heap_destroy (&heap[dir]);
|
|
From: <gi...@gp...> - 2011-02-21 02:45:25
|
The branch, master has been updated
via 359a02cfe25e32aec7d2985c8f368fbfdcd954fa (commit)
from 50b9810c5acdd0caf5ab6efd92db97d6ee747c5b (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/polygon.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
=================
Commit Messages
=================
commit 359a02cfe25e32aec7d2985c8f368fbfdcd954fa
Author: Ineiev <in...@us...>
Commit: Ineiev <in...@us...>
fix polygon regression
Introduced by 2d8dc8a3a3a55158b4e6278dd9f40588e4111c2d
Reported by Kai-Martin Knaak
:100644 100644 c552f3c... 0235495... M src/polygon.c
=========
Changes
=========
commit 359a02cfe25e32aec7d2985c8f368fbfdcd954fa
Author: Ineiev <in...@us...>
Commit: Ineiev <in...@us...>
fix polygon regression
Introduced by 2d8dc8a3a3a55158b4e6278dd9f40588e4111c2d
Reported by Kai-Martin Knaak
diff --git a/src/polygon.c b/src/polygon.c
index c552f3c..0235495 100644
--- a/src/polygon.c
+++ b/src/polygon.c
@@ -498,8 +498,8 @@ ArcPolyNoIntersect (ArcType * a, BDimension thick)
ry = MAX (a->Height - half, 0);
segs = 1;
if(thick > 0)
- segs = a->Delta * M_PI / 360
- * sqrt(sqrt((double)rx*rx + (double)ry*ry)/delta_th/2/thick);
+ segs = MAX (segs, a->Delta * M_PI / 360
+ * sqrt(sqrt((double)rx*rx + (double)ry*ry)/delta_th/2/thick));
segs = MAX(segs, a->Delta / ARC_ANGLE);
ang = a->StartAngle;
|
|
From: <gi...@gp...> - 2011-02-19 14:56:11
|
The branch, master has been updated
via 50b9810c5acdd0caf5ab6efd92db97d6ee747c5b (commit)
from fc464e9b1708953a0e77be75f7d651926c2b9b2c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit 50b9810c5acdd0caf5ab6efd92db97d6ee747c5b
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Fix solder mask drawing glitch in pcb
Applied patch from lp-699498 by rdrehmel
Closes-bug: lp-699498
:100644 100644 bb212e9... 1d8d462... M src/draw.c
=========
Changes
=========
commit 50b9810c5acdd0caf5ab6efd92db97d6ee747c5b
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Fix solder mask drawing glitch in pcb
Applied patch from lp-699498 by rdrehmel
Closes-bug: lp-699498
diff --git a/src/draw.c b/src/draw.c
index bb212e9..1d8d462 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -672,7 +672,7 @@ static int
clearPad_callback (const BoxType * b, void *cl)
{
PadTypePtr pad = (PadTypePtr) b;
- if (!XOR (TEST_FLAG (ONSOLDERFLAG, pad), SWAP_IDENT))
+ if (!XOR (TEST_FLAG (ONSOLDERFLAG, pad), SWAP_IDENT) && pad->Mask)
ClearPad (pad, true);
return 1;
}
|
|
From: <gi...@gp...> - 2011-02-10 18:37:29
|
The branch, master has been updated
via fc464e9b1708953a0e77be75f7d651926c2b9b2c (commit)
from 81e6a463683376f97fa1a18399af282735243997 (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/strflags.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit fc464e9b1708953a0e77be75f7d651926c2b9b2c
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
Use onsolder for text, not auto.
The flags table wasn't using onsolder for text, which meant the default
"auto" was used for it, which doesn't make sense. This makes text on
the solder side use the "onsolder" name instead.
:100644 100644 ac1fdcc... 8f4912c... M src/strflags.c
=========
Changes
=========
commit fc464e9b1708953a0e77be75f7d651926c2b9b2c
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
Use onsolder for text, not auto.
The flags table wasn't using onsolder for text, which meant the default
"auto" was used for it, which doesn't make sense. This makes text on
the solder side use the "onsolder" name instead.
diff --git a/src/strflags.c b/src/strflags.c
index ac1fdcc..8f4912c 100644
--- a/src/strflags.c
+++ b/src/strflags.c
@@ -100,7 +100,7 @@ static FlagBitsType object_flagbits[] = {
{ DISPLAYNAMEFLAG, N ("showname"), ELEMENT_TYPE },
{ CLEARLINEFLAG, N ("clearline"), LINE_TYPE | ARC_TYPE | TEXT_TYPE },
{ SELECTEDFLAG, N ("selected"), ALL_TYPES },
- { ONSOLDERFLAG, N ("onsolder"), ELEMENT_TYPE | PAD_TYPE },
+ { ONSOLDERFLAG, N ("onsolder"), ELEMENT_TYPE | PAD_TYPE | TEXT_TYPE },
{ AUTOFLAG, N ("auto"), ALL_TYPES },
{ SQUAREFLAG, N ("square"), PIN_TYPES | PAD_TYPE },
{ RUBBERENDFLAG, N ("rubberend"), LINE_TYPE | ARC_TYPE },
|
|
From: <gi...@gp...> - 2011-01-28 04:26:06
|
The branch, master has been updated
via 81e6a463683376f97fa1a18399af282735243997 (commit)
from 1b7393d122447d04bb37aa48c91957558c8d83a8 (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/lesstif/main.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
=================
Commit Messages
=================
commit 81e6a463683376f97fa1a18399af282735243997
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
Conditionally use "class" or "c_class" depending on the compiler
language.
The X11 headers define some classes differently based on whether
they're being used for C or C++, so we have to make our access to them
conditional also.
:100644 100644 11740c7... 1f5b7b0... M src/hid/lesstif/main.c
=========
Changes
=========
commit 81e6a463683376f97fa1a18399af282735243997
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
Conditionally use "class" or "c_class" depending on the compiler
language.
The X11 headers define some classes differently based on whether
they're being used for C or C++, so we have to make our access to them
conditional also.
diff --git a/src/hid/lesstif/main.c b/src/hid/lesstif/main.c
index 11740c7..1f5b7b0 100644
--- a/src/hid/lesstif/main.c
+++ b/src/hid/lesstif/main.c
@@ -1006,6 +1006,10 @@ LoadBackgroundFile (FILE *f, char *filename)
vinfo->depth, vinfo->class);
#endif
+#if !defined(__cplusplus)
+#define c_class class
+#endif
+
if (vinfo->c_class == TrueColor
&& vinfo->depth == 16
&& vinfo->red_mask == 0xf800
|
|
From: <gi...@gp...> - 2011-01-28 04:20:40
|
The branch, master has been updated
via 1b7393d122447d04bb37aa48c91957558c8d83a8 (commit)
from 414da4d9d6b83756ba7cc1e727211d05338e987a (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/batch/batch.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit 1b7393d122447d04bb37aa48c91957558c8d83a8
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
C++ compatibility for the batch HID.
Just a keyword rename (xor).
:100644 100644 1fa97c7... ea75d99... M src/hid/batch/batch.c
=========
Changes
=========
commit 1b7393d122447d04bb37aa48c91957558c8d83a8
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
C++ compatibility for the batch HID.
Just a keyword rename (xor).
diff --git a/src/hid/batch/batch.c b/src/hid/batch/batch.c
index 1fa97c7..ea75d99 100644
--- a/src/hid/batch/batch.c
+++ b/src/hid/batch/batch.c
@@ -203,7 +203,7 @@ batch_set_line_width (hidGC gc, int width)
}
static void
-batch_set_draw_xor (hidGC gc, int xor)
+batch_set_draw_xor (hidGC gc, int xor_set)
{
}
|
|
From: <gi...@gp...> - 2011-01-28 04:13:24
|
The branch, master has been updated
via 414da4d9d6b83756ba7cc1e727211d05338e987a (commit)
from 71898679b6f0b0ba7a416d1d43d6c729d0f5339b (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/lesstif/dialogs.c | 10 +++++-----
src/hid/lesstif/lesstif.h | 4 ++--
src/hid/lesstif/main.c | 31 ++++++++++++++++---------------
src/hid/lesstif/menu.c | 3 +--
src/hid/lesstif/styles.c | 2 +-
5 files changed, 25 insertions(+), 25 deletions(-)
=================
Commit Messages
=================
commit 414da4d9d6b83756ba7cc1e727211d05338e987a
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
C++ compatibility for the lesstif HID.
Minor changes - casts, consts, keyword renames, so that the lesstif HID
can be compiled as C or C++.
:100644 100644 a56e3a3... 8756d1f... M src/hid/lesstif/dialogs.c
:100644 100644 3bc822b... 66a5c12... M src/hid/lesstif/lesstif.h
:100644 100644 70a00dc... 11740c7... M src/hid/lesstif/main.c
:100644 100644 6442fcd... 297768b... M src/hid/lesstif/menu.c
:100644 100644 9b67d0f... 829caab... M src/hid/lesstif/styles.c
=========
Changes
=========
commit 414da4d9d6b83756ba7cc1e727211d05338e987a
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
C++ compatibility for the lesstif HID.
Minor changes - casts, consts, keyword renames, so that the lesstif HID
can be compiled as C or C++.
diff --git a/src/hid/lesstif/dialogs.c b/src/hid/lesstif/dialogs.c
index a56e3a3..8756d1f 100644
--- a/src/hid/lesstif/dialogs.c
+++ b/src/hid/lesstif/dialogs.c
@@ -903,7 +903,7 @@ Open the netlist window.
static int
DoWindows (int argc, char **argv, int x, int y)
{
- char *a = argc == 1 ? argv[0] : "";
+ const char *a = argc == 1 ? argv[0] : "";
if (strcmp (a, "1") == 0 || strcasecmp (a, "Layout") == 0)
{
}
@@ -1356,10 +1356,10 @@ typedef struct {
static LgResource lgr;
static XtResource lg_resources[] = {
- { "font", "Font", XtRFontStruct, sizeof(XFontStruct*), XtOffset(LgResource*, font), XtRString, "fixed" },
- { "foreground", "Foreground", XtRPixel, sizeof(Pixel), XtOffset(LgResource*, fg), XtRString, "black" },
- { "selectColor", "Foreground", XtRPixel, sizeof(Pixel), XtOffset(LgResource*, sel), XtRString, "blue" },
- { "background", "Background", XtRPixel, sizeof(Pixel), XtOffset(LgResource*, bg), XtRString, "white" }
+ { "font", "Font", XtRFontStruct, sizeof(XFontStruct*), XtOffset(LgResource*, font), XtRString, (void *)"fixed" },
+ { "foreground", "Foreground", XtRPixel, sizeof(Pixel), XtOffset(LgResource*, fg), XtRString, (void *)"black" },
+ { "selectColor", "Foreground", XtRPixel, sizeof(Pixel), XtOffset(LgResource*, sel), XtRString, (void *)"blue" },
+ { "background", "Background", XtRPixel, sizeof(Pixel), XtOffset(LgResource*, bg), XtRString, (void *)"white" }
};
#if 0
diff --git a/src/hid/lesstif/lesstif.h b/src/hid/lesstif/lesstif.h
index 3bc822b..66a5c12 100644
--- a/src/hid/lesstif/lesstif.h
+++ b/src/hid/lesstif/lesstif.h
@@ -19,8 +19,8 @@ extern Display *display;
extern Screen *screen_s;
extern int screen;
-Widget mainwind, work_area, command, hscroll, vscroll;
-Widget m_click;
+extern Widget mainwind, work_area, command, hscroll, vscroll;
+extern Widget m_click;
extern Widget lesstif_menu (Widget, char *, Arg *, int);
extern int lesstif_key_event (XKeyEvent *);
diff --git a/src/hid/lesstif/main.c b/src/hid/lesstif/main.c
index 70a00dc..11740c7 100644
--- a/src/hid/lesstif/main.c
+++ b/src/hid/lesstif/main.c
@@ -54,7 +54,7 @@ typedef struct hid_gc_struct
const char *colorname;
int width;
EndCapStyle cap;
- char xor;
+ char xor_set;
char erase;
} hid_gc_struct;
@@ -121,6 +121,7 @@ static PinoutData *pinout = 0;
static int crosshair_x = 0, crosshair_y = 0;
static int in_move_event = 0, crosshair_in_window = 1;
+Widget mainwind;
Widget work_area, messages, command, hscroll, vscroll;
static Widget m_mark, m_crosshair, m_grid, m_zoom, m_mode, m_status;
static Widget m_rats;
@@ -1005,14 +1006,14 @@ LoadBackgroundFile (FILE *f, char *filename)
vinfo->depth, vinfo->class);
#endif
- if (vinfo->class == TrueColor
+ if (vinfo->c_class == TrueColor
&& vinfo->depth == 16
&& vinfo->red_mask == 0xf800
&& vinfo->green_mask == 0x07e0
&& vinfo->blue_mask == 0x001f)
pixel_type = PT_RGB565;
- if (vinfo->class == TrueColor
+ if (vinfo->c_class == TrueColor
&& vinfo->depth == 24
&& vinfo->red_mask == 0xff0000
&& vinfo->green_mask == 0x00ff00
@@ -2010,7 +2011,7 @@ lesstif_parse_arguments (int *argc, char ***argv)
amax = acount;
#endif
- new_options = malloc ((amax + 1) * sizeof (XrmOptionDescRec));
+ new_options = (XrmOptionDescRec *) malloc ((amax + 1) * sizeof (XrmOptionDescRec));
#if 0
memcpy (new_options + acount, lesstif_options, sizeof (lesstif_options));
@@ -2023,8 +2024,8 @@ lesstif_parse_arguments (int *argc, char ***argv)
rmax = rcount;
#endif
- new_resources = malloc ((rmax + 1) * sizeof (XtResource));
- new_values = malloc ((rmax + 1) * sizeof (val_union));
+ new_resources = (XtResource *) malloc ((rmax + 1) * sizeof (XtResource));
+ new_values = (val_union *) malloc ((rmax + 1) * sizeof (val_union));
#if 0
memcpy (new_resources + acount, lesstif_resources,
sizeof (lesstif_resources));
@@ -2258,7 +2259,7 @@ draw_grid ()
if (n > npoints)
{
npoints = n + 10;
- points = realloc (points, npoints * sizeof (XPoint));
+ points = (XPoint *) realloc (points, npoints * sizeof (XPoint));
}
n = 0;
prevx = 0;
@@ -2933,7 +2934,7 @@ lesstif_set_layer (const char *name, int group, int empty)
static hidGC
lesstif_make_gc (void)
{
- hidGC rv = malloc (sizeof (hid_gc_struct));
+ hidGC rv = (hid_gc_struct *) malloc (sizeof (hid_gc_struct));
memset (rv, 0, sizeof (hid_gc_struct));
rv->me_pointer = &lesstif_gui;
return rv;
@@ -3087,7 +3088,7 @@ set_gc (hidGC gc)
}
#if 0
printf ("set_gc c%s %08lx w%d c%d x%d e%d\n",
- gc->colorname, gc->color, gc->width, gc->cap, gc->xor, gc->erase);
+ gc->colorname, gc->color, gc->width, gc->cap, gc->xor_set, gc->erase);
#endif
switch (gc->cap)
{
@@ -3109,7 +3110,7 @@ set_gc (hidGC gc)
join = JoinBevel;
break;
}
- if (gc->xor)
+ if (gc->xor_set)
{
XSetFunction (display, my_gc, GXxor);
XSetForeground (display, my_gc, gc->color ^ bgcolor);
@@ -3153,9 +3154,9 @@ lesstif_set_line_width (hidGC gc, int width)
}
static void
-lesstif_set_draw_xor (hidGC gc, int xor)
+lesstif_set_draw_xor (hidGC gc, int xor_set)
{
- gc->xor = xor;
+ gc->xor_set = xor_set;
}
static void
@@ -3545,7 +3546,7 @@ hidval
lesstif_watch_file (int fd, unsigned int condition, void (*func) (hidval watch, int fd, unsigned int condition, hidval user_data),
hidval user_data)
{
- WatchStruct *watch = malloc (sizeof(WatchStruct));
+ WatchStruct *watch = (WatchStruct *) malloc (sizeof(WatchStruct));
hidval ret;
unsigned int xt_condition = 0;
@@ -3595,7 +3596,7 @@ static hidval
lesstif_add_block_hook (void (*func) (hidval data), hidval user_data )
{
hidval ret;
- BlockHookStruct *block_hook = malloc( sizeof( BlockHookStruct ));
+ BlockHookStruct *block_hook = (BlockHookStruct *) malloc( sizeof( BlockHookStruct ));
block_hook->func = func;
block_hook->user_data = user_data;
@@ -3727,7 +3728,7 @@ lesstif_show_item (void *item)
if (!mainwind)
return;
- pd = calloc (1, sizeof (PinoutData));
+ pd = (PinoutData *) calloc (1, sizeof (PinoutData));
pd->item = item;
diff --git a/src/hid/lesstif/menu.c b/src/hid/lesstif/menu.c
index 6442fcd..297768b 100644
--- a/src/hid/lesstif/menu.c
+++ b/src/hid/lesstif/menu.c
@@ -37,7 +37,6 @@ RCSID ("$Id$");
#define R_OK 4
#endif
-Display *display;
static Colormap cmap;
static Arg args[30];
@@ -672,7 +671,7 @@ note_widget_flag (Widget w, char *type, char *name)
if (n_wflags >= max_wflags)
{
max_wflags += 20;
- wflags = realloc (wflags, max_wflags * sizeof (WidgetFlagType));
+ wflags = (WidgetFlagType *) realloc (wflags, max_wflags * sizeof (WidgetFlagType));
}
wflags[n_wflags].w = w;
wflags[n_wflags].flagname = name;
diff --git a/src/hid/lesstif/styles.c b/src/hid/lesstif/styles.c
index 9b67d0f..829caab 100644
--- a/src/hid/lesstif/styles.c
+++ b/src/hid/lesstif/styles.c
@@ -452,7 +452,7 @@ lesstif_insert_style_buttons (Widget menu)
num_style_buttons++;
s = num_style_buttons * sizeof (StyleButtons);
- style_button_list = realloc (style_button_list, s);
+ style_button_list = (StyleButtons *) realloc (style_button_list, s);
sb = style_button_list + num_style_buttons - 1;
for (i = 0; i < NUM_STYLES; i++)
|
|
From: <gi...@gp...> - 2011-01-27 22:18:05
|
The branch, master has been updated
via 71898679b6f0b0ba7a416d1d43d6c729d0f5339b (commit)
from 4570d66a094c717cd8986ebc56d7e2c1e25cfb73 (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/change.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
=================
Commit Messages
=================
commit 71898679b6f0b0ba7a416d1d43d6c729d0f5339b
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
change.c: Restore and clear to polygons when changing hole sizes
This is more consistent with other code-paths and is useful if the
thermal gemoetry were to depend in on the hole size (which it doesn't
currently, but used to do before the clipper branch).
:100644 100644 cb53b47... 95128d0... M src/change.c
=========
Changes
=========
commit 71898679b6f0b0ba7a416d1d43d6c729d0f5339b
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
change.c: Restore and clear to polygons when changing hole sizes
This is more consistent with other code-paths and is useful if the
thermal gemoetry were to depend in on the hole size (which it doesn't
currently, but used to do before the clipper branch).
diff --git a/src/change.c b/src/change.c
index cb53b47..95128d0 100644
--- a/src/change.c
+++ b/src/change.c
@@ -440,21 +440,20 @@ ChangeVia2ndSize (PinTypePtr Via)
{
AddObjectTo2ndSizeUndoList (VIA_TYPE, Via, Via, Via);
EraseVia (Via);
+ RestoreToPolygon (PCB->Data, VIA_TYPE, Via, Via);
Via->DrillingHole = value;
if (TEST_FLAG (HOLEFLAG, Via))
{
- RestoreToPolygon (PCB->Data, VIA_TYPE, Via, Via);
AddObjectToSizeUndoList (VIA_TYPE, Via, Via, Via);
Via->Thickness = value;
- ClearFromPolygon (PCB->Data, VIA_TYPE, Via, Via);
}
+ ClearFromPolygon (PCB->Data, VIA_TYPE, Via, Via);
DrawVia (Via, 0);
return (Via);
}
return (NULL);
}
-
/* ---------------------------------------------------------------------------
* changes the clearance size of a via
* returns TRUE if changed
@@ -629,15 +628,15 @@ ChangeElement2ndSize (ElementTypePtr Element)
changed = true;
AddObjectTo2ndSizeUndoList (PIN_TYPE, Element, pin, pin);
ErasePin (pin);
+ RestoreToPolygon (PCB->Data, PIN_TYPE, Element, pin);
pin->DrillingHole = value;
- DrawPin (pin, 0);
if (TEST_FLAG (HOLEFLAG, pin))
{
- RestoreToPolygon (PCB->Data, PIN_TYPE, Element, pin);
AddObjectToSizeUndoList (PIN_TYPE, Element, pin, pin);
pin->Thickness = value;
- ClearFromPolygon (PCB->Data, PIN_TYPE, Element, pin);
}
+ ClearFromPolygon (PCB->Data, PIN_TYPE, Element, pin);
+ DrawPin (pin, 0);
}
}
END_LOOP;
@@ -666,15 +665,15 @@ ChangePin2ndSize (ElementTypePtr Element, PinTypePtr Pin)
{
AddObjectTo2ndSizeUndoList (PIN_TYPE, Element, Pin, Pin);
ErasePin (Pin);
+ RestoreToPolygon (PCB->Data, PIN_TYPE, Element, Pin);
Pin->DrillingHole = value;
- DrawPin (Pin, 0);
if (TEST_FLAG (HOLEFLAG, Pin))
{
- RestoreToPolygon (PCB->Data, PIN_TYPE, Element, Pin);
AddObjectToSizeUndoList (PIN_TYPE, Element, Pin, Pin);
Pin->Thickness = value;
- ClearFromPolygon (PCB->Data, PIN_TYPE, Element, Pin);
}
+ ClearFromPolygon (PCB->Data, PIN_TYPE, Element, Pin);
+ DrawPin (Pin, 0);
return (Pin);
}
return (NULL);
|
|
From: <gi...@gp...> - 2011-01-26 22:17:31
|
The branch, master has been updated
via 4570d66a094c717cd8986ebc56d7e2c1e25cfb73 (commit)
via f862f65e2e9da0689d64f7a5fbff44e95ba10b0a (commit)
via 00c556b02dfa0113eab62b894eff4cf5d55b8e5f (commit)
from bf409070b0558b4f63b3b78f3a29b57da6b97bb2 (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
=========
configure.ac | 2 +-
doc/gs/fb-blinker.pcb | 3 ---
doc/gs/fb-led-5.pcb | 3 ---
doc/gs/fb-led.pcb | 3 ---
doc/gs/fb-smt.pcb | 3 ---
doc/gs/term-annulus-1.pcb | 3 ---
doc/gs/term-clearance-1.pcb | 3 ---
doc/gs/term-element-1.pcb | 3 ---
doc/gs/term-pad-1.pcb | 3 ---
doc/gs/term-pin-1.pcb | 3 ---
doc/gs/term-platedhole-1.pcb | 3 ---
doc/gs/term-tented-1.pcb | 3 ---
doc/gs/term-thermal-1.pcb | 3 ---
doc/gs/term-thickness-1.pcb | 3 ---
doc/pad.pcb | 2 --
doc/puller.pcb | 3 ---
doc/thermal.pcb | 3 ---
example/LED.pcb | 3 ---
example/LED2.pcb | 3 ---
src/file.c | 34 +++-------------------------------
tests/inputs/bom_general.pcb | 3 ---
tests/inputs/gcode_oneline.pcb | 3 ---
tests/inputs/gerber_oneline.pcb | 3 ---
tutorial/tut1.pcb | 3 ---
24 files changed, 4 insertions(+), 97 deletions(-)
=================
Commit Messages
=================
commit 4570d66a094c717cd8986ebc56d7e2c1e25cfb73
Author: Markus Hitter <ma...@ju...>
Commit: Peter Clifton <pc...@ca...>
configure.ac: remove the now obsolete test for gethostname().
No longer required since commit 00c556b02dfa0113eab62b894eff4cf5d55b8e5f
Reviewed-by: Peter Clifton <pc...@ca...>
Affects-bug: lp-703914
:100644 100644 e405819... 8fde977... M configure.ac
commit f862f65e2e9da0689d64f7a5fbff44e95ba10b0a
Author: Markus Hitter <ma...@ju...>
Commit: Peter Clifton <pc...@ca...>
Remove all date, user and host comments on all test and sample files.
These items are no longer written, so sample files shouldn't
contain them either. Usually, this was line 2...4.
Reviewed-by: Peter Clifton <pc...@ca...>
Affects-bug: lp-703914
:100644 100644 26066ef... 787704a... M doc/gs/fb-blinker.pcb
:100644 100644 f9d6ac9... bb59791... M doc/gs/fb-led-5.pcb
:100644 100644 c67e652... 74f8e9d... M doc/gs/fb-led.pcb
:100644 100644 2b224b0... 4e6f0c9... M doc/gs/fb-smt.pcb
:100644 100644 d3a36ed... 51ab107... M doc/gs/term-annulus-1.pcb
:100644 100644 732df82... 21cdef0... M doc/gs/term-clearance-1.pcb
:100644 100644 ce5579d... e3ce630... M doc/gs/term-element-1.pcb
:100644 100644 c06b12f... e0b1f7f... M doc/gs/term-pad-1.pcb
:100644 100644 a291e3b... ff589fa... M doc/gs/term-pin-1.pcb
:100644 100644 d1f4a82... a4289b3... M doc/gs/term-platedhole-1.pcb
:100644 100644 1abeab2... 4af338a... M doc/gs/term-tented-1.pcb
:100644 100644 8921a76... 37f69a2... M doc/gs/term-thermal-1.pcb
:100644 100644 3bec124... ada246c... M doc/gs/term-thickness-1.pcb
:100644 100644 31218bc... bea2ec2... M doc/pad.pcb
:100644 100644 016ad72... 3cd03d5... M doc/puller.pcb
:100644 100644 bce2f09... 82d0afa... M doc/thermal.pcb
:100755 100755 b3da6f4... a4da6cc... M example/LED.pcb
:100644 100644 63754b5... 7585a8b... M example/LED2.pcb
:100644 100644 d61b301... d11ffe8... M tests/inputs/bom_general.pcb
:100644 100644 c20eacf... 6788491... M tests/inputs/gcode_oneline.pcb
:100644 100644 c20eacf... 6788491... M tests/inputs/gerber_oneline.pcb
:100644 100644 a49095a... d384f52... M tutorial/tut1.pcb
commit 00c556b02dfa0113eab62b894eff4cf5d55b8e5f
Author: Markus Hitter <ma...@ju...>
Commit: Peter Clifton <pc...@ca...>
src/file.c: don't write user name or date to the stored layout file.
Notes from Peter Clifton:
The consensus from bug lp-703914 was that that recording the username,
data and host which produced the file is unnecessary and causes
version control clashes which are otherwise unnecessary.
Reviewed-by: Peter Clifton <pc...@ca...>
Closes-bug: lp-703914
:100644 100644 1df23d5... e87aeea... M src/file.c
=========
Changes
=========
commit 4570d66a094c717cd8986ebc56d7e2c1e25cfb73
Author: Markus Hitter <ma...@ju...>
Commit: Peter Clifton <pc...@ca...>
configure.ac: remove the now obsolete test for gethostname().
No longer required since commit 00c556b02dfa0113eab62b894eff4cf5d55b8e5f
Reviewed-by: Peter Clifton <pc...@ca...>
Affects-bug: lp-703914
diff --git a/configure.ac b/configure.ac
index e405819..8fde977 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,7 +650,7 @@ AC_CHECK_FUNCS(strerror)
AC_CHECK_FUNCS(regcomp re_comp)
AC_CHECK_FUNCS(logf expf rint)
AC_CHECK_FUNCS(vsnprintf)
-AC_CHECK_FUNCS(getpwuid gethostname getcwd)
+AC_CHECK_FUNCS(getpwuid getcwd)
AC_CHECK_FUNCS(random)
AC_CHECK_FUNCS(stat)
commit f862f65e2e9da0689d64f7a5fbff44e95ba10b0a
Author: Markus Hitter <ma...@ju...>
Commit: Peter Clifton <pc...@ca...>
Remove all date, user and host comments on all test and sample files.
These items are no longer written, so sample files shouldn't
contain them either. Usually, this was line 2...4.
Reviewed-by: Peter Clifton <pc...@ca...>
Affects-bug: lp-703914
diff --git a/doc/gs/fb-blinker.pcb b/doc/gs/fb-blinker.pcb
index 26066ef..787704a 100644
--- a/doc/gs/fb-blinker.pcb
+++ b/doc/gs/fb-blinker.pcb
@@ -1,7 +1,4 @@
# release: gpcb 1.99w
-# date: Sun Mar 16 03:12:26 2008
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/fb-led-5.pcb b/doc/gs/fb-led-5.pcb
index f9d6ac9..bb59791 100644
--- a/doc/gs/fb-led-5.pcb
+++ b/doc/gs/fb-led-5.pcb
@@ -1,7 +1,4 @@
# release: gpcb 1.99w
-# date: Fri Dec 7 23:20:12 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/fb-led.pcb b/doc/gs/fb-led.pcb
index c67e652..74f8e9d 100644
--- a/doc/gs/fb-led.pcb
+++ b/doc/gs/fb-led.pcb
@@ -1,7 +1,4 @@
# release: gpcb 1.99w
-# date: Wed Dec 26 17:46:01 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/fb-smt.pcb b/doc/gs/fb-smt.pcb
index 2b224b0..4e6f0c9 100644
--- a/doc/gs/fb-smt.pcb
+++ b/doc/gs/fb-smt.pcb
@@ -1,7 +1,4 @@
# release: gpcb 1.99w
-# date: Sat Aug 2 23:54:58 2008
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-annulus-1.pcb b/doc/gs/term-annulus-1.pcb
index d3a36ed..51ab107 100644
--- a/doc/gs/term-annulus-1.pcb
+++ b/doc/gs/term-annulus-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:24:16 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-clearance-1.pcb b/doc/gs/term-clearance-1.pcb
index 732df82..21cdef0 100644
--- a/doc/gs/term-clearance-1.pcb
+++ b/doc/gs/term-clearance-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:37:50 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-element-1.pcb b/doc/gs/term-element-1.pcb
index ce5579d..e3ce630 100644
--- a/doc/gs/term-element-1.pcb
+++ b/doc/gs/term-element-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:46:21 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-pad-1.pcb b/doc/gs/term-pad-1.pcb
index c06b12f..e0b1f7f 100644
--- a/doc/gs/term-pad-1.pcb
+++ b/doc/gs/term-pad-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:55:56 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-pin-1.pcb b/doc/gs/term-pin-1.pcb
index a291e3b..ff589fa 100644
--- a/doc/gs/term-pin-1.pcb
+++ b/doc/gs/term-pin-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:57:02 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-platedhole-1.pcb b/doc/gs/term-platedhole-1.pcb
index d1f4a82..a4289b3 100644
--- a/doc/gs/term-platedhole-1.pcb
+++ b/doc/gs/term-platedhole-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 01:29:49 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-tented-1.pcb b/doc/gs/term-tented-1.pcb
index 1abeab2..4af338a 100644
--- a/doc/gs/term-tented-1.pcb
+++ b/doc/gs/term-tented-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 01:25:16 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-thermal-1.pcb b/doc/gs/term-thermal-1.pcb
index 8921a76..37f69a2 100644
--- a/doc/gs/term-thermal-1.pcb
+++ b/doc/gs/term-thermal-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sat Dec 1 22:42:34 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/gs/term-thickness-1.pcb b/doc/gs/term-thickness-1.pcb
index 3bec124..ada246c 100644
--- a/doc/gs/term-thickness-1.pcb
+++ b/doc/gs/term-thickness-1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99w
-# date: Sun Dec 2 00:40:19 2007
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/doc/pad.pcb b/doc/pad.pcb
index 31218bc..bea2ec2 100644
--- a/doc/pad.pcb
+++ b/doc/pad.pcb
@@ -1,6 +1,4 @@
# release: pcb-bin 1.99q
-# date: Tue Mar 21 18:28:39 2006
-# user: mcmahill (Dan McMahill)
PCB["pad" 600000 500000]
diff --git a/doc/puller.pcb b/doc/puller.pcb
index 016ad72..3cd03d5 100644
--- a/doc/puller.pcb
+++ b/doc/puller.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99s
-# date: Fri Apr 14 23:17:49 2006
-# user: dj (DJ Delorie)
-# host: envy.delorie.com
PCB["" 110000 30000]
diff --git a/doc/thermal.pcb b/doc/thermal.pcb
index bce2f09..82d0afa 100644
--- a/doc/thermal.pcb
+++ b/doc/thermal.pcb
@@ -1,7 +1,4 @@
# release: pcb-bin 1.99q
-# date: Fri Mar 24 21:29:02 2006
-# user: Dan
-# host: none
PCB["thermal" 300000 300000]
diff --git a/example/LED.pcb b/example/LED.pcb
index b3da6f4..a4da6cc 100755
--- a/example/LED.pcb
+++ b/example/LED.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.7.0.ALPHA
-# date: Wed Apr 11 11:54:53 2001
-# user: root (root)
-# host: tse-eatonha2
PCB("" 3500 3300)
diff --git a/example/LED2.pcb b/example/LED2.pcb
index 63754b5..7585a8b 100644
--- a/example/LED2.pcb
+++ b/example/LED2.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.9.9d.ALPHA
-# date: Sun Jan 20 18:53:49 2002
-# user: root (root)
-# host: localhost
PCB("" 3500 3300)
diff --git a/tests/inputs/bom_general.pcb b/tests/inputs/bom_general.pcb
index d61b301..d11ffe8 100644
--- a/tests/inputs/bom_general.pcb
+++ b/tests/inputs/bom_general.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99y
-# date: Wed Jun 17 10:41:24 2009
-# user: dan (Dan McMahill,At Home ,258-8142,)
-# host: bondage
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/tests/inputs/gcode_oneline.pcb b/tests/inputs/gcode_oneline.pcb
index c20eacf..6788491 100644
--- a/tests/inputs/gcode_oneline.pcb
+++ b/tests/inputs/gcode_oneline.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99y
-# date: Wed Jun 24 12:26:14 2009
-# user: dan (Dan McMahill,At Home ,258-8142,)
-# host: bondage
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/tests/inputs/gerber_oneline.pcb b/tests/inputs/gerber_oneline.pcb
index c20eacf..6788491 100644
--- a/tests/inputs/gerber_oneline.pcb
+++ b/tests/inputs/gerber_oneline.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.99y
-# date: Wed Jun 24 12:26:14 2009
-# user: dan (Dan McMahill,At Home ,258-8142,)
-# host: bondage
# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
FileVersion[20070407]
diff --git a/tutorial/tut1.pcb b/tutorial/tut1.pcb
index a49095a..d384f52 100644
--- a/tutorial/tut1.pcb
+++ b/tutorial/tut1.pcb
@@ -1,7 +1,4 @@
# release: pcb 1.9.9d.ALPHA
-# date: Sun Jan 20 18:58:24 2002
-# user: root (root)
-# host: localhost
PCB("" 3500 3300)
commit 00c556b02dfa0113eab62b894eff4cf5d55b8e5f
Author: Markus Hitter <ma...@ju...>
Commit: Peter Clifton <pc...@ca...>
src/file.c: don't write user name or date to the stored layout file.
Notes from Peter Clifton:
The consensus from bug lp-703914 was that that recording the username,
data and host which produced the file is unnecessary and causes
version control clashes which are otherwise unnecessary.
Reviewed-by: Peter Clifton <pc...@ca...>
Closes-bug: lp-703914
diff --git a/src/file.c b/src/file.c
index 1df23d5..e87aeea 100644
--- a/src/file.c
+++ b/src/file.c
@@ -491,44 +491,16 @@ WriteAttributeList (FILE * FP, AttributeListTypePtr list, char *prefix)
/* ---------------------------------------------------------------------------
* writes layout header information
- * date, UID and name of user
*/
static void
WritePCBInfoHeader (FILE * FP)
{
-#ifdef HAVE_GETPWUID
- struct passwd *pwentry;
-#endif
-
-#ifdef HAVE_GETHOSTNAME
- static struct hostent *hostentry = NULL;
- char hostname[256];
-#endif
- time_t currenttime;
-
/* write some useful comments */
- currenttime = time (NULL);
fprintf (FP, "# release: %s " VERSION "\n", Progname);
- fprintf (FP, "# date: %s", asctime (localtime (¤ttime)));
-
-#ifdef HAVE_GETPWUID
- pwentry = getpwuid (getuid ());
- fprintf (FP, "# user: %s (%s)\n", pwentry->pw_name, pwentry->pw_gecos);
-#else
- fprintf (FP, "# user: Unknown\n");
-#endif
-#ifdef HAVE_GETHOSTNAME
- if (gethostname (hostname, 255) != -1)
- {
- if (hostentry == NULL)
- hostentry = gethostbyname (hostname);
- fprintf (FP, "# host: %s\n",
- hostentry ? hostentry->h_name : hostname);
- }
-#else
- fprintf (FP, "# host: Unknown\n");
-#endif
+ /* avoid writing things like user name or date, as these cause merge
+ * conflicts in collaborative environments using version control systems
+ */
}
/* ---------------------------------------------------------------------------
|
|
From: <gi...@gp...> - 2011-01-23 07:22:10
|
The branch, master has been updated
via bf409070b0558b4f63b3b78f3a29b57da6b97bb2 (commit)
from fc0f0e38bb0f9c307497e94bf74816b5121b820e (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, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit bf409070b0558b4f63b3b78f3a29b57da6b97bb2
Author: Bob Paddock <bob...@gm...>
Commit: DJ Delorie <dj...@de...>
Compiling with MinGW requires cast to const for _spawnvp to compile without warning.
:100644 100644 fd90b19... de2738e... M src/action.c
=========
Changes
=========
commit bf409070b0558b4f63b3b78f3a29b57da6b97bb2
Author: Bob Paddock <bob...@gm...>
Commit: DJ Delorie <dj...@de...>
Compiling with MinGW requires cast to const for _spawnvp to compile without warning.
diff --git a/src/action.c b/src/action.c
index fd90b19..de2738e 100644
--- a/src/action.c
+++ b/src/action.c
@@ -7330,7 +7330,7 @@ static int
pcb_spawnvp (char **argv)
{
#ifdef HAVE__SPAWNVP
- int result = _spawnvp (_P_WAIT, argv[0], argv);
+ int result = _spawnvp (_P_WAIT, argv[0], (const char * const *) argv);
if (result == -1)
return 1;
else
|
|
From: <gi...@gp...> - 2011-01-23 07:11:22
|
The branch, master has been updated
via fc0f0e38bb0f9c307497e94bf74816b5121b820e (commit)
from ccae6f40fb7d339abab68784e40370974984d539 (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/gcode/gcode.c | 1 +
src/hid/nelma/nelma.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
=================
Commit Messages
=================
commit fc0f0e38bb0f9c307497e94bf74816b5121b820e
Author: Bob Paddock <bob...@gm...>
Commit: DJ Delorie <dj...@de...>
Add missing Message() prototype to remove warning about same.
:100644 100644 64d45cb... d2dd717... M src/hid/gcode/gcode.c
:100644 100644 60f5b37... 0a1efef... M src/hid/nelma/nelma.c
=========
Changes
=========
commit fc0f0e38bb0f9c307497e94bf74816b5121b820e
Author: Bob Paddock <bob...@gm...>
Commit: DJ Delorie <dj...@de...>
Add missing Message() prototype to remove warning about same.
diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c
index 64d45cb..d2dd717 100644
--- a/src/hid/gcode/gcode.c
+++ b/src/hid/gcode/gcode.c
@@ -45,6 +45,7 @@
#include <time.h>
#include "global.h"
+#include "error.h" /* Message() */
#include "data.h"
#include "misc.h"
#include "rats.h"
diff --git a/src/hid/nelma/nelma.c b/src/hid/nelma/nelma.c
index 60f5b37..0a1efef 100644
--- a/src/hid/nelma/nelma.c
+++ b/src/hid/nelma/nelma.c
@@ -64,6 +64,7 @@
#include <time.h>
#include "global.h"
+#include "error.h" /* Message() */
#include "data.h"
#include "misc.h"
#include "rats.h"
|
|
From: <gi...@gp...> - 2011-01-23 07:04:44
|
The branch, master has been updated
via ccae6f40fb7d339abab68784e40370974984d539 (commit)
from 089fbaf59c78fe75475db737e7e2827cd745d570 (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/polygon1.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit ccae6f40fb7d339abab68784e40370974984d539
Author: Bob Paddock <bob...@gm...>
Commit: DJ Delorie <dj...@de...>
Initialize min_dist to zero before using in if().
:100644 100644 8e9aa24... 0a3a2b5... M src/polygon1.c
=========
Changes
=========
commit ccae6f40fb7d339abab68784e40370974984d539
Author: Bob Paddock <bob...@gm...>
Commit: DJ Delorie <dj...@de...>
Initialize min_dist to zero before using in if().
diff --git a/src/polygon1.c b/src/polygon1.c
index 8e9aa24..0a3a2b5 100644
--- a/src/polygon1.c
+++ b/src/polygon1.c
@@ -3016,7 +3016,7 @@ poly_ComputeInteriorPoint (PLINE *poly, Vector v)
VNODE *pt1, *pt2, *pt3, *q;
VNODE *min_q = NULL;
double dist;
- double min_dist;
+ double min_dist = 0.0;
double dir = (poly->Flags.orient == PLF_DIR) ? 1. : -1;
/* Find a convex node on the polygon */
|
|
From: <gi...@gp...> - 2011-01-23 06:48:28
|
The branch, master has been updated
via 089fbaf59c78fe75475db737e7e2827cd745d570 (commit)
from 5f0f788dc12a10a3c01ade7cf00d5ed63922ca47 (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
=========
configure.ac | 25 +++++++-
src/action.c | 50 ++++++++++----
src/autoplace.c | 9 ++-
src/autoroute.c | 125 ++++++++++++++++++++++------------
src/change.c | 2 +-
src/create.c | 14 ++--
src/dbus-pcbmain.c | 24 ++++---
src/draw.c | 12 ++--
src/drill.c | 6 +-
src/edif.y | 46 +++++--------
src/file.c | 30 ++++----
src/find.c | 64 +++++++++---------
src/free_atexit.c | 2 +-
src/global.h | 3 +-
src/heap.c | 4 +-
src/hid.h | 10 ++-
src/hid/bom/bom.c | 56 ++++++++--------
src/hid/common/actions.c | 6 +-
src/hid/common/draw_helpers.c | 8 +-
src/hid/common/extents.c | 4 +-
src/hid/common/flags.c | 4 +-
src/hid/common/hid_resource.c | 8 +-
src/hid/common/hidinit.c | 9 ++-
src/hid/common/hidnogui.c | 2 +-
src/hid/gcode/gcode.c | 14 ++--
src/hid/gerber/gerber.c | 140 ++++++++++++++++++++++----------------
src/hid/gtk/gtkhid-gdk.c | 22 +++---
src/hid/gtk/gtkhid-main.c | 20 +++---
src/hid/gtk/gui-command-window.c | 2 +-
src/hid/gtk/gui-config.c | 36 +++++-----
src/hid/gtk/gui-dialog-print.c | 24 +++---
src/hid/gtk/gui-dialog-size.c | 66 +++++++++++++++---
src/hid/gtk/gui-dialog.c | 22 +++---
src/hid/gtk/gui-drc-window.c | 26 ++++----
src/hid/gtk/gui-library-window.c | 8 +-
src/hid/gtk/gui-log-window.c | 2 +-
src/hid/gtk/gui-misc.c | 20 +++---
src/hid/gtk/gui-netlist-window.c | 4 +-
src/hid/gtk/gui-output-events.c | 2 +-
src/hid/gtk/gui-pinout-preview.c | 8 +-
src/hid/gtk/gui-top-window.c | 38 +++++-----
src/hid/gtk/gui-utils.c | 10 ++--
src/hid/gtk/gui.h | 16 ++--
src/hid/nelma/nelma.c | 12 ++--
src/hid/png/png.c | 10 ++--
src/hid/ps/eps.c | 136 ++++++++++++++++++++++---------------
src/hid/ps/ps.c | 6 +-
src/insert.c | 22 +++---
src/intersect.c | 8 +-
src/main.c | 4 +-
src/misc.c | 6 +-
src/move.c | 120 ++++++++++++++++----------------
src/mtspace.c | 87 +++++++++++++-----------
src/mymem.c | 48 +++++++-------
src/netlist.c | 2 +-
src/parse_l.l | 4 +-
src/parse_y.y | 7 +-
src/polygon.c | 32 ++++----
src/polygon1.c | 114 +++++++++++++++---------------
src/puller.c | 12 ++--
src/rats.c | 26 ++++----
src/rats.h | 2 +-
src/report.c | 2 +-
src/rtree.c | 10 ++--
src/toporouter.c | 66 +++++++++---------
src/undo.c | 24 +++---
src/vector.c | 20 +++---
src/vendor.c | 4 +-
68 files changed, 987 insertions(+), 800 deletions(-)
=================
Commit Messages
=================
commit 089fbaf59c78fe75475db737e7e2827cd745d570
Author: Newell Jensen <pil...@gm...>
Commit: DJ Delorie <dj...@de...>
Initial C++ compatibility patch
Doesn't cover lesstif or batch hids. Makes source code build without
warnings on C, and build with warnings on C++.
:100644 100644 ca2dbe4... e405819... M configure.ac
:100644 100644 5acd3fd... fd90b19... M src/action.c
:100644 100644 ed2014a... e1461c6... M src/autoplace.c
:100644 100644 976ef09... b2cbab4... M src/autoroute.c
:100644 100644 2545d84... cb53b47... M src/change.c
:100644 100644 07de918... f942c40... M src/create.c
:100644 100644 83b2e97... 07e68c0... M src/dbus-pcbmain.c
:100644 100644 e0890da... bb212e9... M src/draw.c
:100644 100644 1f1d770... a7a908b... M src/drill.c
:100644 100644 d9dbd8e... da33c9b... M src/edif.y
:100644 100644 9e38217... 1df23d5... M src/file.c
:100644 100644 613629a... 615659d... M src/find.c
:100644 100644 501775c... 6527a46... M src/free_atexit.c
:100644 100644 bb78abc... 0420a18... M src/global.h
:100644 100644 fee6412... 9e0f35e... M src/heap.c
:100644 100644 94734ba... b13e75b... M src/hid.h
:100644 100644 04ad123... 661b592... M src/hid/bom/bom.c
:100644 100644 d1e87f5... 43c50f8... M src/hid/common/actions.c
:100644 100644 1c7ead9... dc1f60f... M src/hid/common/draw_helpers.c
:100644 100644 e8bd8ab... 0f51b47... M src/hid/common/extents.c
:100644 100644 30859fb... 9b53328... M src/hid/common/flags.c
:100644 100644 d5ba274... 11f1171... M src/hid/common/hid_resource.c
:100644 100644 bb1a66b... 9c4f8ee... M src/hid/common/hidinit.c
:100644 100644 08adb26... fd86b6a... M src/hid/common/hidnogui.c
:100644 100644 f1bdcea... 64d45cb... M src/hid/gcode/gcode.c
:100644 100644 85e01f3... 63344b3... M src/hid/gerber/gerber.c
:100644 100644 0a2cc59... 6ea9f9b... M src/hid/gtk/gtkhid-gdk.c
:100644 100644 8bbf3eb... 169884e... M src/hid/gtk/gtkhid-main.c
:100644 100644 b97ec0b... d865dee... M src/hid/gtk/gui-command-window.c
:100644 100644 36277eb... 516feb5... M src/hid/gtk/gui-config.c
:100644 100644 0c50aed... 9ced77b... M src/hid/gtk/gui-dialog-print.c
:100644 100644 8409ba5... a5b5888... M src/hid/gtk/gui-dialog-size.c
:100644 100644 80c1157... bb934bd... M src/hid/gtk/gui-dialog.c
:100644 100644 e2fa201... a708193... M src/hid/gtk/gui-drc-window.c
:100644 100644 f54d914... eb366ba... M src/hid/gtk/gui-library-window.c
:100644 100644 ae25ed7... a91f346... M src/hid/gtk/gui-log-window.c
:100644 100644 e3316aa... 1c55a99... M src/hid/gtk/gui-misc.c
:100644 100644 a5e38d1... b60b8ba... M src/hid/gtk/gui-netlist-window.c
:100644 100644 2e820a3... 349f91b... M src/hid/gtk/gui-output-events.c
:100644 100644 212d37a... fc69639... M src/hid/gtk/gui-pinout-preview.c
:100644 100644 f2cdb99... 4186d85... M src/hid/gtk/gui-top-window.c
:100644 100644 3d93d19... 5db7b42... M src/hid/gtk/gui-utils.c
:100644 100644 d2a76ce... df30955... M src/hid/gtk/gui.h
:100644 100644 5f6ebc7... 60f5b37... M src/hid/nelma/nelma.c
:100644 100644 32639c8... 06e22bb... M src/hid/png/png.c
:100644 100644 83ce780... 49a19c7... M src/hid/ps/eps.c
:100644 100644 eacf826... 7c286cc... M src/hid/ps/ps.c
:100644 100644 5e62463... 7e9ebf2... M src/insert.c
:100644 100644 7389ba9... e7612e9... M src/intersect.c
:100644 100644 735fde7... 3fff933... M src/main.c
:100644 100644 e1e14c8... 13c7398... M src/misc.c
:100644 100644 cbb2e3d... 5e3913c... M src/move.c
:100644 100644 3640f5c... 9d593e8... M src/mtspace.c
:100644 100644 09cb6ab... 24f20a2... M src/mymem.c
:100644 100644 4a26bc9... 0c004f9... M src/netlist.c
:100644 100644 9799250... 57cd1c6... M src/parse_l.l
:100644 100644 7aa7b80... d0f31aa... M src/parse_y.y
:100644 100644 72d92c9... c552f3c... M src/polygon.c
:100644 100644 468c139... 8e9aa24... M src/polygon1.c
:100644 100644 66a5a03... 8e56f0b... M src/puller.c
:100644 100644 3e9d6ee... 24be309... M src/rats.c
:100644 100644 eb928d4... 3d70f27... M src/rats.h
:100644 100644 f0668d9... 9135e0d... M src/report.c
:100644 100644 f44672c... e2ef1ee... M src/rtree.c
:100644 100644 bfd494a... 28a3764... M src/toporouter.c
:100644 100644 5226c53... b14e3ec... M src/undo.c
:100644 100644 169afd3... c039b89... M src/vector.c
:100644 100644 a296aa1... 5b7f5eb... M src/vendor.c
=========
Changes
=========
commit 089fbaf59c78fe75475db737e7e2827cd745d570
Author: Newell Jensen <pil...@gm...>
Commit: DJ Delorie <dj...@de...>
Initial C++ compatibility patch
Doesn't cover lesstif or batch hids. Makes source code build without
warnings on C, and build with warnings on C++.
diff --git a/configure.ac b/configure.ac
index ca2dbe4..e405819 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1017,7 +1017,7 @@ LIBS="$LIBS $XM_LIBS $DBUS_LIBS $X_LIBS $GLIB_LIBS $GTK_LIBS $DMALLOC_LIBS $GD_L
# if we have gcc then add -Wall
if test "x$GCC" = "xyes"; then
# see about adding some extra checks if the compiler takes them
- for flag in -Wall -Wdeclaration-after-statement ; do
+ for flag in -Wall ; do
case " ${CFLAGS} " in
*\ ${flag}\ *)
# flag is already present
@@ -1039,6 +1039,29 @@ fi
CXXFLAGS="$CFLAGS"
+# Now add C-specific flags
+if test "x$GCC" = "xyes"; then
+ # see about adding some extra checks if the compiler takes them
+ for flag in -Wdeclaration-after-statement ; do
+ case " ${CFLAGS} " in
+ *\ ${flag}\ *)
+ # flag is already present
+ ;;
+ *)
+ AC_MSG_CHECKING([if the compiler accepts ${flag}])
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS ${flag}"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])
+ CFLAGS="$ac_save_CFLAGS"
+ ]
+ )
+ ;;
+ esac
+ done
+fi
+
# See if we are building gcc with C++.
AC_ARG_ENABLE(build-with-cxx,
[ --enable-build-with-cxx build with C++ compiler instead of C compiler],
diff --git a/src/action.c b/src/action.c
index 5acd3fd..fd90b19 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1495,7 +1495,7 @@ NotifyMode (void)
{
/* Create POLYAREAs from the original polygon
* and the new hole polygon */
- original = PolygonToPoly (Crosshair.AttachedObject.Ptr2);
+ original = PolygonToPoly ((PolygonType *)Crosshair.AttachedObject.Ptr2);
new_hole = PolygonToPoly (&Crosshair.AttachedPolygon);
/* Subtract the hole from the original polygon shape */
@@ -1506,7 +1506,7 @@ NotifyMode (void)
*/
SaveUndoSerialNumber ();
Flags = ((PolygonType *)Crosshair.AttachedObject.Ptr2)->Flags;
- PolyToPolygonsOnLayer (PCB->Data, Crosshair.AttachedObject.Ptr1,
+ PolyToPolygonsOnLayer (PCB->Data, (LayerType *)Crosshair.AttachedObject.Ptr1,
result, Flags);
RemoveObject (POLYGON_TYPE,
Crosshair.AttachedObject.Ptr1,
@@ -2654,6 +2654,27 @@ the crosshair steps along the grid.
%end-doc */
+static enum crosshair_shape
+CrosshairShapeIncrement (enum crosshair_shape shape)
+{
+ switch(shape)
+ {
+ case Basic_Crosshair_Shape:
+ shape = Union_Jack_Crosshair_Shape;
+ break;
+ case Union_Jack_Crosshair_Shape:
+ shape = Dozen_Crosshair_Shape;
+ break;
+ case Dozen_Crosshair_Shape:
+ shape = Crosshair_Shapes_Number;
+ break;
+ case Crosshair_Shapes_Number:
+ shape = Basic_Crosshair_Shape;
+ break;
+ }
+ return shape;
+}
+
static int
ActionDisplay (int argc, char **argv, int childX, int childY)
{
@@ -2735,7 +2756,8 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
break;
case F_CycleCrosshair:
- Crosshair.shape++;
+ //Crosshair.shape++;
+ Crosshair.shape = CrosshairShapeIncrement(Crosshair.shape);
if (Crosshair_Shapes_Number == Crosshair.shape)
Crosshair.shape = Basic_Crosshair_Shape;
break;
@@ -3368,10 +3390,10 @@ ActionRenumber (int argc, char **argv, int x, int y)
*
* We'll actually renumber things in the 2nd pass.
*/
- element_list = calloc (PCB->Data->ElementN, sizeof (ElementTypePtr));
- locked_element_list = calloc (PCB->Data->ElementN, sizeof (ElementTypePtr));
- was = calloc (PCB->Data->ElementN, sizeof (char *));
- is = calloc (PCB->Data->ElementN, sizeof (char *));
+ element_list = (ElementType **)calloc (PCB->Data->ElementN, sizeof (ElementTypePtr));
+ locked_element_list = (ElementType **)calloc (PCB->Data->ElementN, sizeof (ElementTypePtr));
+ 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
|| is == NULL)
{
@@ -3441,7 +3463,7 @@ ActionRenumber (int argc, char **argv, int x, int y)
unique = TEST_FLAG (UNIQUENAMEFLAG, PCB);
CLEAR_FLAG (UNIQUENAMEFLAG, PCB);
- cnt_list = calloc (cnt_list_sz, sizeof (struct _cnt_list));
+ cnt_list = (struct _cnt_list *)calloc (cnt_list_sz, sizeof (struct _cnt_list));
for (i = 0; i < cnt; i++)
{
/* If there is no refdes, maybe just spit out a warning */
@@ -3464,7 +3486,7 @@ ActionRenumber (int argc, char **argv, int x, int y)
if (j == cnt_list_sz)
{
cnt_list_sz += 100;
- cnt_list = realloc (cnt_list, cnt_list_sz);
+ cnt_list = (struct _cnt_list *)realloc (cnt_list, cnt_list_sz);
if (cnt_list == NULL)
{
fprintf (stderr, "realloc failed() in %s\n", __FUNCTION__);
@@ -3508,7 +3530,7 @@ ActionRenumber (int argc, char **argv, int x, int y)
sz++;
tmpi = tmpi / 10;
}
- tmps = malloc (sz * sizeof (char));
+ tmps = (char *)malloc (sz * sizeof (char));
sprintf (tmps, "%s%d", cnt_list[j].name, cnt_list[j].cnt);
/*
@@ -3598,7 +3620,7 @@ ActionRenumber (int argc, char **argv, int x, int y)
{
free (PCB->NetlistLib.Menu[i].Entry[j].ListEntry);
PCB->NetlistLib.Menu[i].Entry[j].ListEntry =
- malloc ((strlen (is[k]) + strlen (pin) +
+ (char *)malloc ((strlen (is[k]) + strlen (pin) +
2) * sizeof (char));
sprintf (PCB->NetlistLib.Menu[i].Entry[j].ListEntry,
"%s-%s", is[k], pin);
@@ -6063,8 +6085,8 @@ Selects the given buffer to be the current paste buffer.
static int
ActionPasteBuffer (int argc, char **argv, int x, int y)
{
- char *function = argc ? argv[0] : "";
- char *sbufnum = argc > 1 ? argv[1] : "";
+ char *function = argc ? argv[0] : (char *)"";
+ char *sbufnum = argc > 1 ? argv[1] : (char *)"";
char *name;
static char *default_file = NULL;
int free_name = 0;
@@ -7870,7 +7892,7 @@ ActionImport (int argc, char **argv, int x, int y)
cmd[i++] = "-f";
cmd[i++] = user_makefile;
}
- cmd[i++] = user_target ? user_target : "pcb_import";
+ cmd[i++] = user_target ? user_target : (char *)"pcb_import";
cmd[i++] = NULL;
if (pcb_spawnvp (cmd))
diff --git a/src/autoplace.c b/src/autoplace.c
index ed2014a..e1461c6 100644
--- a/src/autoplace.c
+++ b/src/autoplace.c
@@ -132,12 +132,13 @@ typedef struct
}
ElementPtrListType;
+enum ewhich
+ { SHIFT, ROTATE, EXCHANGE };
+
typedef struct
{
ElementTypePtr element;
- enum
- { SHIFT, ROTATE, EXCHANGE }
- which;
+ enum ewhich which;
LocationType DX, DY; /* for shift */
BYTE rotate; /* for rotate/flip */
ElementTypePtr other; /* for exchange */
@@ -528,7 +529,7 @@ ComputeCost (NetListTypePtr Nets, double T0, double T)
boxpp = (struct ebox **)
GetPointerMemory (TEST_FLAG (ONSOLDERFLAG, element) ?
&seboxes : &ceboxes);
- *boxpp = malloc (sizeof (**boxpp));
+ *boxpp = (struct ebox *)malloc (sizeof (**boxpp));
if (*boxpp == NULL )
{
fprintf (stderr, "malloc() failed in %s\n", __FUNCTION__);
diff --git a/src/autoroute.c b/src/autoroute.c
index 976ef09..b2cbab4 100644
--- a/src/autoroute.c
+++ b/src/autoroute.c
@@ -103,6 +103,42 @@ RCSID ("$Id$");
//#define DEBUG_SHOW_ZIGZAG
*/
+static direction_t
+directionIncrement(direction_t dir)
+{
+ switch(dir)
+ {
+ case NORTH:
+ dir = EAST;
+ break;
+ case EAST:
+ dir = SOUTH;
+ break;
+ case SOUTH:
+ dir = WEST;
+ break;
+ case WEST:
+ dir = NE;
+ break;
+ case NE:
+ dir = SE;
+ break;
+ case SE:
+ dir = SW;
+ break;
+ case SW:
+ dir = NW;
+ break;
+ case NW:
+ dir = ALL;
+ break;
+ case ALL:
+ dir = NORTH;
+ break;
+ }
+return dir;
+}
+
static hidGC ar_gc = 0;
#define EXPENSIVE 3e28
@@ -185,9 +221,18 @@ typedef enum
{ NO_CONFLICT = 0, LO_CONFLICT = 1, HI_CONFLICT = 2 }
conflict_t;
+typedef struct routebox_list
+{
+ struct routebox *next, *prev;
+}routebox_list;
+
+typedef enum etype
+ { PAD, PIN, VIA, VIA_SHADOW, LINE, OTHER, EXPANSION_AREA, PLANE, THERMAL }
+ etype;
+
typedef struct routebox
{
- const BoxType box, sbox;
+ BoxType box, sbox;
union
{
PadTypePtr pad;
@@ -202,9 +247,7 @@ typedef struct routebox
parent;
unsigned short group;
unsigned short layer;
- enum
- { PAD, PIN, VIA, VIA_SHADOW, LINE, OTHER, EXPANSION_AREA, PLANE, THERMAL }
- type;
+ etype type;
struct
{
unsigned nonstraight:1;
@@ -263,11 +306,7 @@ typedef struct routebox
/* the direction this came from, if any */
direction_t came_from;
/* circular lists with connectivity information. */
- struct routebox_list
- {
- struct routebox *next, *prev;
- }
- same_net, same_subnet, original_subnet, different_net;
+ routebox_list same_net, same_subnet, original_subnet, different_net;
}
routebox_t;
@@ -609,7 +648,7 @@ AddPin (PointerListType layergroupboxes[], PinTypePtr pin, bool is_via,
for (i = 0; i < max_group; i++)
{
rbpp = (routebox_t **) GetPointerMemory (&layergroupboxes[i]);
- *rbpp = malloc (sizeof (**rbpp));
+ *rbpp = (routebox_t *)malloc (sizeof (**rbpp));
memset ((void *) *rbpp, 0, sizeof (**rbpp));
(*rbpp)->group = i;
ht = HALF_THICK (MAX (pin->Thickness, pin->DrillingHole));
@@ -657,7 +696,7 @@ AddPad (PointerListType layergroupboxes[],
assert (PCB->LayerGroups.Number[layergroup] > 0);
rbpp = (routebox_t **) GetPointerMemory (&layergroupboxes[layergroup]);
assert (rbpp);
- *rbpp = malloc (sizeof (**rbpp));
+ *rbpp = (routebox_t *)malloc (sizeof (**rbpp));
assert (*rbpp);
memset (*rbpp, 0, sizeof (**rbpp));
(*rbpp)->group = layergroup;
@@ -691,7 +730,7 @@ AddLine (PointerListType layergroupboxes[], int layergroup, LineTypePtr line,
assert (PCB->LayerGroups.Number[layergroup] > 0);
rbpp = (routebox_t **) GetPointerMemory (&layergroupboxes[layergroup]);
- *rbpp = malloc (sizeof (**rbpp));
+ *rbpp = (routebox_t *)malloc (sizeof (**rbpp));
memset (*rbpp, 0, sizeof (**rbpp));
(*rbpp)->group = layergroup;
init_const_box (*rbpp,
@@ -739,7 +778,7 @@ AddIrregularObstacle (PointerListType layergroupboxes[],
assert (PCB->LayerGroups.Number[layergroup] > 0);
rbpp = (routebox_t **) GetPointerMemory (&layergroupboxes[layergroup]);
- *rbpp = malloc (sizeof (**rbpp));
+ *rbpp = (routebox_t *)malloc (sizeof (**rbpp));
memset (*rbpp, 0, sizeof (**rbpp));
(*rbpp)->group = layergroup;
init_const_box (*rbpp, X1, Y1, X2, Y2, keep);
@@ -942,7 +981,7 @@ CreateRouteData ()
}
}
/* create routedata */
- rd = malloc (sizeof (*rd));
+ rd = (routedata_t *)malloc (sizeof (*rd));
memset ((void *) rd, 0, sizeof (*rd));
/* create default style */
rd->defaultstyle.Thick = Settings.LineThickness;
@@ -1059,24 +1098,24 @@ CreateRouteData ()
{
case PAD_TYPE:
rb =
- AddPad (layergroupboxes, connection->ptr1,
- connection->ptr2, rd->styles[j]);
+ AddPad (layergroupboxes, (ElementType *)connection->ptr1,
+ (PadType *)connection->ptr2, rd->styles[j]);
break;
case PIN_TYPE:
rb =
- AddPin (layergroupboxes, connection->ptr2, false,
+ AddPin (layergroupboxes, (PinType *)connection->ptr2, false,
rd->styles[j]);
break;
case VIA_TYPE:
rb =
- AddPin (layergroupboxes, connection->ptr2, true,
+ AddPin (layergroupboxes, (PinType *)connection->ptr2, true,
rd->styles[j]);
break;
case POLYGON_TYPE:
rb =
AddPolygon (layergroupboxes,
- GetLayerNumber (PCB->Data, connection->ptr1),
- connection->ptr2, rd->styles[j]);
+ GetLayerNumber (PCB->Data, (LayerType *)connection->ptr1),
+ (struct polygon_st *)connection->ptr2, rd->styles[j]);
break;
}
assert (rb);
@@ -1706,7 +1745,7 @@ CreateEdge (routebox_t * rb,
{
edge_t *e;
assert (__routebox_is_good (rb));
- e = malloc (sizeof (*e));
+ e = (edge_t *)malloc (sizeof (*e));
memset ((void *) e, 0, sizeof (*e));
assert (e);
e->rb = rb;
@@ -2757,7 +2796,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
if (e->expand_dir == NE || e->expand_dir == SE ||
e->expand_dir == SW || e->expand_dir == NW)
{
- BoxType *fb = (BoxType *) & fake.sbox;
+ BoxType *fb = (BoxType *) &fake.sbox;
memset (&fake, 0, sizeof (fake));
*fb = e->rb->sbox;
fake.flags.fixed = 1; /* this stops expansion there */
@@ -2766,7 +2805,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
#ifndef NDEBUG
/* the routbox_is_good checker wants a lot more! */
fake.flags.inited = 1;
- fb = (BoxType *) & fake.box;
+ fb = (BoxType *) &fake.box;
*fb = e->rb->sbox;
fake.same_net.next = fake.same_net.prev = &fake;
fake.same_subnet.next = fake.same_subnet.prev = &fake;
@@ -2778,7 +2817,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
* in clockwise order, which allows finding corners that can
* be expanded.
*/
- for (dir = NORTH; dir <= WEST; dir++)
+ for (dir = NORTH; dir <= WEST; directionIncrement(dir))
{
/* don't break the edge we came from */
if (e->expand_dir != ((dir + 2) % 4))
@@ -2855,7 +2894,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
* moveable as possible.
*/
first = last = -1;
- for (dir = NORTH; dir <= WEST; dir++)
+ for (dir = NORTH; dir <= WEST; directionIncrement(dir))
{
if (heap[dir] && !heap_is_empty (heap[dir]))
{
@@ -2895,7 +2934,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
assert (0);
break;
}
- moveable_edge (edges, &db, dir + 3, rb, NULL, e, targets,
+ moveable_edge (edges, &db, (direction_t)(dir + 3), rb, NULL, e, targets,
s, NULL, NULL);
}
else if (dir == NORTH) /* north is start, so nothing "before" it */
@@ -2922,7 +2961,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
* which it belongs to.
*/
BoxType db = previous_edge (last, dir, &rb->sbox);
- moveable_edge (edges, &db, dir - 1, rb, NULL, e, targets, s,
+ moveable_edge (edges, &db, (direction_t)(dir - 1), rb, NULL, e, targets, s,
NULL, NULL);
}
if (broke.is_valid_center && !blk->flags.source)
@@ -2954,7 +2993,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
}
if (heap_is_empty (heap[dir]))
break;
- blk = heap_remove_smallest (heap[dir]);
+ blk = (routebox_t *)heap_remove_smallest (heap[dir]);
broke = break_box_edge (&b, dir, blk);
if (broke.is_valid_left)
moveable_edge (edges, &broke.left, dir, rb, NULL, e, targets,
@@ -2986,7 +3025,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
{
/* expand the leftover from the prior direction */
BoxType db = previous_edge (last, dir, &rb->sbox);
- moveable_edge (edges, &db, dir - 1, rb, NULL, e, targets, s,
+ moveable_edge (edges, &db, (direction_t)(dir - 1), rb, NULL, e, targets, s,
NULL, NULL);
}
last = -1;
@@ -3018,7 +3057,7 @@ BreakManyEdges (struct routeone_state * s, rtree_t * targets, rtree_t * tree,
}
}
/* done with all expansion edges of this box */
- for (dir = NORTH; dir <= WEST; dir++)
+ for (dir = NORTH; dir <= WEST; directionIncrement(dir))
{
if (heap[dir])
heap_destroy (&heap[dir]);
@@ -3680,7 +3719,7 @@ CreateSearchEdge (struct routeone_state *s, vetting_t * work, edge_t * parent,
if (cost < s->best_cost)
{
edge_t *ne;
- ne = malloc (sizeof (*ne));
+ ne = (edge_t *)malloc (sizeof (*ne));
memset ((void *) ne, 0, sizeof (*ne));
assert (ne);
ne->flags.via_search = 1;
@@ -3809,7 +3848,7 @@ do_via_search (edge_t * search, struct routeone_state *s,
while (!vector_is_empty (v))
{
BoxType cliparea;
- BoxType *area = vector_remove_last (v);
+ BoxType *area = (BoxType *)vector_remove_last (v);
if (!(i == NO_CONFLICT || AutoRouteParameters.with_conflicts))
{
free (area);
@@ -3827,7 +3866,7 @@ do_via_search (edge_t * search, struct routeone_state *s,
if (j == within->group || !is_layer_group_active[j])
continue;
ne = CreateViaEdge (&cliparea, j, within, search,
- within_conflict_level, i, targets);
+ within_conflict_level, (conflict_t)i, targets);
add_or_destroy_edge (s, ne);
}
}
@@ -3965,9 +4004,9 @@ __conflict_source (const BoxType * box, void *cl)
return 0;
else
{
- routebox_t *this = (routebox_t *) cl;
- path_conflicts (this, rb, false);
- touch_conflicts (this->conflicts_with, 1);
+ routebox_t *dis = (routebox_t *) cl;
+ path_conflicts (dis, rb, false);
+ touch_conflicts (dis->conflicts_with, 1);
}
return 1;
}
@@ -4080,7 +4119,7 @@ RouteOne (routedata_t * rd, routebox_t * from, routebox_t * to, int max_edges)
assert (!from->flags.target);
assert (num_targets > 0);
/* create list of target pointers and from that a r-tree of targets */
- target_list = malloc (num_targets * sizeof (*target_list));
+ target_list = (const BoxType **)malloc (num_targets * sizeof (*target_list));
i = 0;
LIST_LOOP (from, same_net, p);
if (p->flags.target)
@@ -4091,7 +4130,7 @@ RouteOne (routedata_t * rd, routebox_t * from, routebox_t * to, int max_edges)
#endif
}
END_LOOP;
- targets = r_create_tree (target_list, i, 0);
+ targets = r_create_tree ((const BoxType **)target_list, i, 0);
assert (i <= num_targets);
free (target_list);
@@ -4139,7 +4178,7 @@ RouteOne (routedata_t * rd, routebox_t * from, routebox_t * to, int max_edges)
assert (s.workheap);
while (!vector_is_empty (source_vec))
{
- edge_t *e = vector_remove_last (source_vec);
+ edge_t *e = (edge_t *)vector_remove_last (source_vec);
assert (is_layer_group_active[e->rb->group]);
e->cost = edge_cost (e, EXPENSIVE);
heap_insert (s.workheap, e->cost, e);
@@ -4155,7 +4194,7 @@ RouteOne (routedata_t * rd, routebox_t * from, routebox_t * to, int max_edges)
vss.hi_conflict_space_vec = vector_create ();
while (!heap_is_empty (s.workheap))
{
- edge_t *e = heap_remove_smallest (s.workheap);
+ edge_t *e = (edge_t *)heap_remove_smallest (s.workheap);
#ifdef ROUTE_DEBUG
if (aabort)
goto dontexpand;
@@ -4431,7 +4470,7 @@ RouteOne (routedata_t * rd, routebox_t * from, routebox_t * to, int max_edges)
area_vec, ans, nrb, e);
while (!vector_is_empty (broken))
{
- edge_t *ne = vector_remove_last (broken);
+ edge_t *ne = (edge_t *)vector_remove_last (broken);
add_or_destroy_edge (&s, ne);
}
vector_destroy (&broken);
@@ -4468,7 +4507,7 @@ RouteOne (routedata_t * rd, routebox_t * from, routebox_t * to, int max_edges)
{
while (!vector_is_empty (s.best_path->conflicts_with))
{
- rb = vector_remove_last (s.best_path->conflicts_with);
+ rb = (routebox_t *)vector_remove_last (s.best_path->conflicts_with);
rb->flags.is_bad = 1;
result.route_had_conflicts++;
}
@@ -4506,7 +4545,7 @@ RouteOne (routedata_t * rd, routebox_t * from, routebox_t * to, int max_edges)
/* now remove all expansion areas from the r-tree. */
while (!vector_is_empty (area_vec))
{
- routebox_t *rb = vector_remove_last (area_vec);
+ routebox_t *rb = (routebox_t *)vector_remove_last (area_vec);
assert (!rb->flags.homeless);
if (rb->conflicts_with
&& rb->parent.expansion_area->conflicts_with != rb->conflicts_with)
diff --git a/src/change.c b/src/change.c
index 2545d84..cb53b47 100644
--- a/src/change.c
+++ b/src/change.c
@@ -2283,7 +2283,7 @@ QueryInputAndChangeObjectName (int Type, void *Ptr1, void *Ptr2, void *Ptr3)
if (name)
{
/* NB: ChangeObjectName takes ownership of the passed memory */
- char *old = ChangeObjectName (Type, Ptr1, Ptr2, Ptr3, name);
+ char *old = (char *)ChangeObjectName (Type, Ptr1, Ptr2, Ptr3, name);
if (old != (char *) -1)
{
AddObjectToChangeNameUndoList (Type, Ptr1, Ptr2, Ptr3, old);
diff --git a/src/create.c b/src/create.c
index 07de918..f942c40 100644
--- a/src/create.c
+++ b/src/create.c
@@ -93,7 +93,7 @@ CreateNewBuffer (void)
{
DataTypePtr data;
data = (DataTypePtr) calloc (1, sizeof (DataType));
- data->pcb = (void *) PCB;
+ data->pcb = (PCBTypePtr) PCB;
return data;
}
@@ -148,9 +148,9 @@ CreateNewPCB (bool SetDefaultNames)
int i;
/* allocate memory, switch all layers on and copy resources */
- ptr = calloc (1, sizeof (PCBType));
+ ptr = (PCBTypePtr)calloc (1, sizeof (PCBType));
ptr->Data = CreateNewBuffer ();
- ptr->Data->pcb = (void *) ptr;
+ ptr->Data->pcb = (PCBTypePtr) ptr;
ptr->ThermStyle = 4;
ptr->IsleArea = 2.e8;
@@ -719,7 +719,7 @@ CreateNewArcInElement (ElementTypePtr Element,
if (Element->ArcN >= Element->ArcMax)
{
Element->ArcMax += STEP_ELEMENTARC;
- arc = realloc (arc, Element->ArcMax * sizeof (ArcType));
+ arc = (ArcTypePtr)realloc (arc, Element->ArcMax * sizeof (ArcType));
Element->Arc = arc;
memset (arc + Element->ArcN, 0, STEP_ELEMENTARC * sizeof (ArcType));
}
@@ -765,7 +765,7 @@ CreateNewLineInElement (ElementTypePtr Element,
if (Element->LineN >= Element->LineMax)
{
Element->LineMax += STEP_ELEMENTLINE;
- line = realloc (line, Element->LineMax * sizeof (LineType));
+ line = (LineTypePtr)realloc (line, Element->LineMax * sizeof (LineType));
Element->Line = line;
memset (line + Element->LineN, 0, STEP_ELEMENTLINE * sizeof (LineType));
}
@@ -932,7 +932,7 @@ CreateNewLineInSymbol (SymbolTypePtr Symbol,
if (Symbol->LineN >= Symbol->LineMax)
{
Symbol->LineMax += STEP_SYMBOLLINE;
- line = realloc (line, Symbol->LineMax * sizeof (LineType));
+ line = (LineTypePtr)realloc (line, Symbol->LineMax * sizeof (LineType));
Symbol->Line = line;
memset (line + Symbol->LineN, 0, STEP_SYMBOLLINE * sizeof (LineType));
}
@@ -1019,7 +1019,7 @@ CreateNewAttribute (AttributeListTypePtr list, char *name, char *value)
if (list->Number >= list->Max)
{
list->Max += 10;
- list->List = realloc (list->List, list->Max * sizeof (AttributeType));
+ list->List = (AttributeType *)realloc (list->List, list->Max * sizeof (AttributeType));
}
list->List[list->Number].name = STRDUP (name);
list->List[list->Number].value = STRDUP (value);
diff --git a/src/dbus-pcbmain.c b/src/dbus-pcbmain.c
index 83b2e97..07e68c0 100644
--- a/src/dbus-pcbmain.c
+++ b/src/dbus-pcbmain.c
@@ -74,7 +74,7 @@ static void
io_watch_handler_dbus_freed (void *data)
{
IOWatchHandler *handler;
- handler = data;
+ handler = (IOWatchHandler *)data;
// Remove the watch registered with the HID
gui->unwatch_file (handler->pcb_watch);
@@ -121,7 +121,7 @@ static void
timeout_handler_dbus_freed (void *data)
{
TimeoutHandler *handler;
- handler = data;
+ handler = (TimeoutHandler *)data;
// Remove the timeout registered with the HID
gui->stop_timer (handler->pcb_timer);
@@ -133,7 +133,7 @@ void
timeout_handler_cb (hidval data)
{
TimeoutHandler *handler;
- handler = data.ptr;
+ handler = (TimeoutHandler *)data.ptr;
// Re-add the timeout, as PCB will remove the current one
// Do this before calling to dbus, incase DBus removes the timeout.
@@ -152,6 +152,7 @@ watch_add (DBusWatch * dbus_watch, void *data)
int fd;
unsigned int pcb_condition;
unsigned int dbus_flags;
+ hidval temp;
// We won't create a watch until it becomes enabled.
if (!dbus_watch_get_enabled (dbus_watch))
@@ -171,11 +172,11 @@ watch_add (DBusWatch * dbus_watch, void *data)
fd = dbus_watch_get_fd (dbus_watch);
#endif
- handler = malloc (sizeof (IOWatchHandler));
+ handler = (IOWatchHandler *)malloc (sizeof (IOWatchHandler));
+ temp.ptr = (void *)handler;
handler->dbus_watch = dbus_watch;
handler->pcb_watch =
- gui->watch_file (fd, pcb_condition, io_watch_handler_cb,
- (hidval) (void *) handler);
+ gui->watch_file (fd, pcb_condition, io_watch_handler_cb, temp);
dbus_watch_set_data (dbus_watch, handler, io_watch_handler_dbus_freed);
return TRUE;
@@ -203,6 +204,7 @@ static dbus_bool_t
timeout_add (DBusTimeout * timeout, void *data)
{
TimeoutHandler *handler;
+ hidval temp;
// We won't create a timeout until it becomes enabled.
if (!dbus_timeout_get_enabled (timeout))
@@ -212,12 +214,12 @@ timeout_add (DBusTimeout * timeout, void *data)
// to manually re-add the timer each time it expires.
// This is non-ideal, and hopefully can be changed?
- handler = malloc (sizeof (TimeoutHandler));
+ handler = (TimeoutHandler *)malloc (sizeof (TimeoutHandler));
+ temp.ptr = (void *)handler;
handler->dbus_timeout = timeout;
handler->interval = dbus_timeout_get_interval (timeout);
handler->pcb_timer =
- gui->add_timer (timeout_handler_cb, handler->interval,
- (hidval) (void *) handler);
+ gui->add_timer (timeout_handler_cb, handler->interval, temp);
dbus_timeout_set_data (timeout, handler, timeout_handler_dbus_freed);
return TRUE;
@@ -264,6 +266,7 @@ void
pcb_dbus_connection_setup_with_mainloop (DBusConnection * connection)
{
//ConnectionSetup *cs;
+ hidval temp;
/* FIXME we never free the slot, so its refcount just keeps growing,
* which is kind of broken.
@@ -300,7 +303,8 @@ pcb_dbus_connection_setup_with_mainloop (DBusConnection * connection)
// cs, NULL);
/* Register a new mainloop hook to mop up any unfinished IO. */
- gui->add_block_hook (block_hook_cb, (hidval) (void *) connection);
+ temp.ptr = (void *)connection;
+ gui->add_block_hook (block_hook_cb, temp);
return;
nomem:
diff --git a/src/draw.c b/src/draw.c
index e0890da..bb212e9 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -1209,9 +1209,9 @@ DrawPinOrViaNameLowLevel (PinTypePtr Ptr)
TextType text;
if (!Ptr->Name || !Ptr->Name[0])
- name = EMPTY (Ptr->Number);
+ name = (char *)EMPTY (Ptr->Number);
else
- name = EMPTY (TEST_FLAG (SHOWNUMBERFLAG, PCB) ? Ptr->Number : Ptr->Name);
+ name = (char *)EMPTY (TEST_FLAG (SHOWNUMBERFLAG, PCB) ? Ptr->Number : Ptr->Name);
vert = TEST_FLAG (EDGE2FLAG, Ptr);
@@ -1425,9 +1425,9 @@ DrawPadNameLowLevel (PadTypePtr Pad)
TextType text;
if (!Pad->Name || !Pad->Name[0])
- name = EMPTY (Pad->Number);
+ name = (char *)EMPTY (Pad->Number);
else
- name = EMPTY (TEST_FLAG (SHOWNUMBERFLAG, PCB) ? Pad->Number : Pad->Name);
+ name = (char *)EMPTY (TEST_FLAG (SHOWNUMBERFLAG, PCB) ? Pad->Number : Pad->Name);
/* should text be vertical ? */
vert = (Pad->Point1.X == Pad->Point2.X);
@@ -2292,7 +2292,7 @@ EraseObject (int type, void *lptr, void *ptr)
break;
case TEXT_TYPE:
case ELEMENTNAME_TYPE:
- EraseText (lptr, (TextTypePtr) ptr);
+ EraseText ((LayerTypePtr)lptr, (TextTypePtr) ptr);
break;
case POLYGON_TYPE:
ErasePolygon ((PolygonTypePtr) ptr);
@@ -2396,7 +2396,7 @@ hid_expose_callback (HID * hid, BoxType * region, void *item)
if (item)
{
doing_pinout = true;
- DrawElement (item, 0);
+ DrawElement ((ElementTypePtr)item, 0);
doing_pinout = false;
}
else
diff --git a/src/drill.c b/src/drill.c
index 1f1d770..a7a908b 100644
--- a/src/drill.c
+++ b/src/drill.c
@@ -126,7 +126,7 @@ GetDrillInfo (DataTypePtr top)
bool DrillFound = false;
bool NewDrill;
- AllDrills = calloc (1, sizeof (DrillInfoType));
+ AllDrills = (DrillInfoTypePtr)calloc (1, sizeof (DrillInfoType));
ALLPIN_LOOP (top);
{
if (!DrillFound)
@@ -235,7 +235,7 @@ RoundDrillInfo (DrillInfoTypePtr d, int roundto)
= d->Drill[i].ElementN + d->Drill[i+1].ElementN;
if (d->Drill[i].ElementMax)
{
- d->Drill[i].Element = realloc (d->Drill[i].Element,
+ d->Drill[i].Element = (ElementTypePtr *)realloc (d->Drill[i].Element,
d->Drill[i].ElementMax *
sizeof (ElementTypePtr));
@@ -253,7 +253,7 @@ RoundDrillInfo (DrillInfoTypePtr d, int roundto)
d->Drill[i + 1].Element = NULL;
d->Drill[i].PinMax = d->Drill[i].PinN + d->Drill[i + 1].PinN;
- d->Drill[i].Pin = realloc (d->Drill[i].Pin,
+ d->Drill[i].Pin = (PinTypePtr *)realloc (d->Drill[i].Pin,
d->Drill[i].PinMax *
sizeof (PinTypePtr));
memcpy (d->Drill[i].Pin + d->Drill[i].PinN, d->Drill[i + 1].Pin,
diff --git a/src/edif.y b/src/edif.y
index d9dbd8e..da33c9b 100644
--- a/src/edif.y
+++ b/src/edif.y
@@ -57,7 +57,7 @@ LibraryEntryTypePtr GetLibraryEntryMemory (LibraryMenuTypePtr);
str_pair* new_str_pair(char* s1, char* s2)
{
- str_pair* ps = malloc(sizeof(str_pair));
+ str_pair* ps = (str_pair *)malloc(sizeof(str_pair));
ps->str1 = s1;
ps->str2 = s2;
ps->next = NULL;
@@ -66,7 +66,7 @@ LibraryEntryTypePtr GetLibraryEntryMemory (LibraryMenuTypePtr);
pair_list* new_pair_list(str_pair* ps)
{
- pair_list* pl = malloc(sizeof(pair_list));
+ pair_list* pl = (pair_list *)malloc(sizeof(pair_list));
pl->list = ps;
pl->name = NULL;
return pl;
@@ -116,7 +116,7 @@ LibraryEntryTypePtr GetLibraryEntryMemory (LibraryMenuTypePtr);
/* if renamed str2 also exists and must be freed */
if ( name->str2 ) free(name->str2);
free(name);
- buf = malloc(256);
+ buf = (char *)malloc(256);
if ( !buf )
{
/* no memory */
@@ -143,7 +143,7 @@ LibraryEntryTypePtr GetLibraryEntryMemory (LibraryMenuTypePtr);
if ( tl + 3 > 256 )
{
free(buf);
- buf = malloc(tl+3);
+ buf = (char *)malloc(tl+3);
if ( !buf )
{
/* no memory */
@@ -2601,10 +2601,9 @@ Keyword : EDIF_TOK_KEYWORD { $$=$1; }
*
* Garbage function for 'alloca()'.
*/
-char *xmalloc(siz)
-int siz;
+char *xmalloc(int siz)
{
- return (Malloc(siz));
+ return ((char *)Malloc(siz));
}
/*
* Token & context carriers:
@@ -3762,8 +3761,7 @@ static Keyword *KeywordTable[KEYWORD_HASH];
*
* The passed string is entered into the keyword hash table.
*/
-static void EnterKeyword(str)
-char *str;
+static void EnterKeyword(char * str)
{
/*
* Locals.
@@ -3788,8 +3786,7 @@ char *str;
* is real useful for doing string comparisons by pointer value later.
* If there is no match, a NULL is returned.
*/
-static char *FindKeyword(str)
-char *str;
+static char *FindKeyword(char * str)
{
/*
* Locals.
@@ -3837,8 +3834,7 @@ static Token *TokenHash[TOKEN_HASH];
* A pointer to the token of the passed code is returned. If
* no such beastie is present a NULL is returned instead.
*/
-static Token *FindToken(cod)
-register int cod;
+static Token *FindToken(register int cod)
{
/*
* Locals.
@@ -3871,8 +3867,7 @@ static Context *ContextHash[CONTEXT_HASH];
* A pointer to the context of the passed code is returned. If
* no such beastie is present a NULL is returned instead.
*/
-static Context *FindContext(cod)
-register int cod;
+static Context *FindContext(register int cod)
{
/*
* Locals.
@@ -3909,16 +3904,14 @@ static short TokenType[TS_DEPTH]; /* token types */
* Add a token to the debug stack. The passed string and type are
* what is to be pushed.
*/
-static Stack(str,typ)
-char *str;
-int typ;
+static Stack(char * str, int typ)
{
/*
* Free any previous string, then push.
*/
if (TokenStack[TSP & TS_MASK])
Free(TokenStack[TSP & TS_MASK]);
- TokenStack[TSP & TS_MASK] = strcpy(Malloc(strlen(str) + 1),str);
+ TokenStack[TSP & TS_MASK] = strcpy((char *)Malloc(strlen(str) + 1),str);
TokenType[TSP & TS_MASK] = typ;
TSP += 1;
}
@@ -4006,8 +3999,7 @@ static int StringSize = 0; /* current string length */
*
* This adds the passed charater to the current string bucket.
*/
-static void PushString(chr)
-char chr;
+static void PushString(char chr)
{
/*
* Locals.
@@ -4178,8 +4170,7 @@ void ParseEDIF(char* filename,FILE* err)
* list to see if it is enabled. If so the token value is returned,
* if not then zero.
*/
-static int MatchToken(str)
-register char *str;
+static int MatchToken(register char * str)
{
/*
* Locals.
@@ -4207,8 +4198,7 @@ register char *str;
* If the passed keyword string is within the current context, the
* new context is pushed and token value is returned. A zero otherwise.
*/
-static int MatchContext(str)
-register char *str;
+static int MatchContext(register char * str)
{
/*
* Locals.
@@ -4350,7 +4340,7 @@ static int yylex()
break;
Ungetc(c);
yytext[--l] = '\0';
- yylval.s = strcpy(Malloc(l + 1),yytext);
+ yylval.s = strcpy((char *)Malloc(l + 1),yytext);
Stack(yytext,EDIF_TOK_INT);
return (EDIF_TOK_INT);
/*
@@ -4366,7 +4356,7 @@ static int yylex()
Stack(yytext,c);
return (c);
}
- yylval.s = strcpy(Malloc(l + 1),yytext);
+ yylval.s = strcpy((char *)Malloc(l + 1),yytext);
Stack(yytext, EDIF_TOK_IDENT);
return (EDIF_TOK_IDENT);
/*
@@ -4398,7 +4388,7 @@ static int yylex()
Stack(yytext,c);
return (c);
}
- yylval.s = strcpy(Malloc(l + 1),yytext);
+ yylval.s = strcpy((char *)Malloc(l + 1),yytext);
Stack(yytext, EDIF_TOK_KEYWORD);
return (EDIF_TOK_KEYWORD);
/*
diff --git a/src/file.c b/src/file.c
index 9e38217..1df23d5 100644
--- a/src/file.c
+++ b/src/file.c
@@ -440,7 +440,7 @@ PreLoadElementPCB ()
yyFont = &yyPCB->Font;
yyData = yyPCB->Data;
- yyData->pcb = (void *)yyPCB;
+ yyData->pcb = yyPCB;
yyData->LayerN = 0;
}
@@ -556,7 +556,7 @@ WritePCBDataHeader (FILE * FP)
fprintf (FP, "FileVersion[%i]\n", PCB_FILE_VERSION);
fputs ("\nPCB[", FP);
- PrintQuotedString (FP, EMPTY (PCB->Name));
+ PrintQuotedString (FP, (char *)EMPTY (PCB->Name));
fprintf (FP, " %i %i]\n\n", (int) PCB->MaxWidth, (int) PCB->MaxHeight);
fprintf (FP, "Grid[%s %i %i %i]\n",
c_dtostr (PCB->Grid), (int) PCB->GridOffsetX,
@@ -639,7 +639,7 @@ WriteViaData (FILE * FP, DataTypePtr Data)
fprintf (FP, "Via[%i %i %i %i %i %i ",
via->X, via->Y,
via->Thickness, via->Clearance, via->Mask, via->DrillingHole);
- PrintQuotedString (FP, EMPTY (via->Name));
+ PrintQuotedString (FP, (char *)EMPTY (via->Name));
fprintf (FP, " %s]\n", F2S (via, VIA_TYPE));
}
}
@@ -681,7 +681,7 @@ WritePCBNetlistData (FILE * FP)
fprintf (FP, "\tNet(");
PrintQuotedString(FP, &menu->Name[2]);
fprintf (FP, " ");
- PrintQuotedString(FP, UNKNOWN (menu->Style));
+ PrintQuotedString(FP, (char *)UNKNOWN (menu->Style));
fprintf (FP, ")\n\t(\n");
for (p = 0; p < menu->EntryN; p++)
{
@@ -714,11 +714,11 @@ WriteElementData (FILE * FP, DataTypePtr Data)
* both names of an element
*/
fprintf (FP, "\nElement[%s ", F2S (element, ELEMENT_TYPE));
- PrintQuotedString (FP, EMPTY (DESCRIPTION_NAME (element)));
+ PrintQuotedString (FP, (char *)EMPTY (DESCRIPTION_NAME (element)));
fputc (' ', FP);
- PrintQuotedString (FP, EMPTY (NAMEONPCB_NAME (element)));
+ PrintQuotedString (FP, (char *)EMPTY (NAMEONPCB_NAME (element)));
fputc (' ', FP);
- PrintQuotedString (FP, EMPTY (VALUE_NAME (element)));
+ PrintQuotedString (FP, (char *)EMPTY (VALUE_NAME (element)));
fprintf (FP, " %i %i %i %i %i %i %s]\n(\n",
(int) element->MarkX, (int) element->MarkY,
(int) (DESCRIPTION_TEXT (element).X -
@@ -737,9 +737,9 @@ WriteElementData (FILE * FP, DataTypePtr Data)
(int) (pin->Y - element->MarkY),
(int) pin->Thickness, (int) pin->Clearance,
(int) pin->Mask, (int) pin->DrillingHole);
- PrintQuotedString (FP, EMPTY (pin->Name));
+ PrintQuotedString (FP, (char *)EMPTY (pin->Name));
fprintf (FP, " ");
- PrintQuotedString (FP, EMPTY (pin->Number));
+ PrintQuotedString (FP, (char *)EMPTY (pin->Number));
fprintf (FP, " %s]\n", F2S (pin, PIN_TYPE));
}
for (p = 0; p < element->PadN; p++)
@@ -752,9 +752,9 @@ WriteElementData (FILE * FP, DataTypePtr Data)
(int) (pad->Point2.Y - element->MarkY),
(int) pad->Thickness, (int) pad->Clearance,
(int) pad->Mask);
- PrintQuotedString (FP, EMPTY (pad->Name));
+ PrintQuotedString (FP, (char *)EMPTY (pad->Name));
fprintf (FP, " ");
- PrintQuotedString (FP, EMPTY (pad->Number));
+ PrintQuotedString (FP, (char *)EMPTY (pad->Number));
fprintf (FP, " %s]\n", F2S (pad, PAD_TYPE));
}
for (p = 0; p < element->LineN; p++)
@@ -798,7 +798,7 @@ WriteLayerData (FILE * FP, Cardinal Number, LayerTypePtr layer)
(layer->Name && *layer->Name))
{
fprintf (FP, "Layer(%i ", (int) Number + 1);
- PrintQuotedString (FP, EMPTY (layer->Name));
+ PrintQuotedString (FP, (char *)EMPTY (layer->Name));
fputs (")\n(\n", FP);
WriteAttributeList (FP, &layer->Attributes, "\t");
@@ -826,7 +826,7 @@ WriteLayerData (FILE * FP, Cardinal Number, LayerTypePtr layer)
fprintf (FP, "\tText[%i %i %i %i ",
(int) text->X, (int) text->Y,
(int) text->Direction, (int) text->Scale);
- PrintQuotedString (FP, EMPTY (text->TextString));
+ PrintQuotedString (FP, (char *)EMPTY (text->TextString));
fprintf (FP, " %s]\n", F2S (text, TEXT_TYPE));
}
for (n = 0; n < layer->PolygonN; n++)
@@ -1231,7 +1231,7 @@ LoadNewlibFootprintsFromDir(char *libpath, char *toppath)
* entry->ListEntry points to fp name itself.
*/
len = strlen(subdir) + strlen("/") + strlen(subdirentry->d_name) + 1;
- entry->AllocatedMemory = calloc (1, len);
+ entry->AllocatedMemory = (char *)calloc (1, len);
strcat (entry->AllocatedMemory, subdir);
strcat (entry->AllocatedMemory, PCB_DIR_SEPARATOR_S);
@@ -1455,7 +1455,7 @@ ReadLibraryContents (void)
/* create the list entry */
len = strlen (EMPTY (entry->Value)) +
strlen (EMPTY (entry->Description)) + 4;
- entry->ListEntry = calloc (len, sizeof (char));
+ entry->ListEntry = (char *)calloc (len, sizeof (char));
sprintf (entry->ListEntry,
"%s, %s", EMPTY (entry->Value),
EMPTY (entry->Description));
diff --git a/src/find.c b/src/find.c
index 613629a..615659d 100644
--- a/src/find.c
+++ b/src/find.c
@@ -176,7 +176,7 @@ static DrcViolationType
long int *object_id_list,
int *object_type_list)
{
- DrcViolationType *violation = malloc (sizeof (DrcViolationType));
+ DrcViolationType *violation = (DrcViolationType *)malloc (sizeof (DrcViolationType));
violation->title = strdup (title);
violation->explanation = strdup (explanation);
@@ -614,7 +614,7 @@ InitComponentLookup (void)
for (i = 0; i < 2; i++)
{
/* allocate memory for working list */
- PadList[i].Data = calloc (NumberOfPads[i], sizeof (PadTypePtr));
+ PadList[i].Data = (void **)calloc (NumberOfPads[i], sizeof (PadTypePtr));
/* clear some struct members */
PadList[i].Location = 0;
@@ -641,12 +641,12 @@ InitLayoutLookup (void)
if (layer->LineN)
{
/* allocate memory for line pointer lists */
- LineList[i].Data = calloc (layer->LineN, sizeof (LineTypePtr));
+ LineList[i].Data = (void **)calloc (layer->LineN, sizeof (LineTypePtr));
LineList[i].Size = layer->LineN;
}
if (layer->ArcN)
{
- ArcList[i].Data = calloc (layer->ArcN, sizeof (ArcTypePtr));
+ ArcList[i].Data = (void **)calloc (layer->ArcN, sizeof (ArcTypePtr));
ArcList[i].Size = layer->ArcN;
}
@@ -654,7 +654,7 @@ InitLayoutLookup (void)
/* allocate memory for polygon list */
if (layer->PolygonN)
{
- PolygonList[i].Data = calloc (layer->PolygonN, sizeof (PolygonTypePtr));
+ PolygonList[i].Data = (void **)calloc (layer->PolygonN, sizeof (PolygonTypePtr));
PolygonList[i].Size = layer->PolygonN;
}
@@ -679,13 +679,13 @@ InitLayoutLookup (void)
else
TotalV = 0;
/* allocate memory for 'new PV to check' list and clear struct */
- PVList.Data = calloc (TotalP + TotalV, sizeof (PinTypePtr));
+ PVList.Data = (void **)calloc (TotalP + TotalV, sizeof (PinTypePtr));
PVList.Size = TotalP + TotalV;
PVList.Location = 0;
PVList.DrawLocation = 0;
PVList.Number = 0;
/* Initialize ratline data */
- RatList.Data = calloc (PCB->Data->RatN, sizeof (RatTypePtr));
+ RatList.Data = (void **)calloc (PCB->Data->RatN, sizeof (RatTypePtr));
RatList.Size = PCB->Data->RatN;
RatList.Location = 0;
RatList.DrawLocation = 0;
@@ -2771,9 +2771,9 @@ PrintElementNameList (ElementTypePtr Element, FILE * FP)
{
static DynamicStringType cname, pname, vname;
- CreateQuotedString (&cname, EMPTY (DESCRIPTION_NAME (Element)));
- CreateQuotedString (&pname, EMPTY (NAMEONPCB_NAME (Element)));
- CreateQuotedString (&vname, EMPTY (VALUE_NAME (Element)));
+ CreateQuotedString (&cname, (char *)EMPTY (DESCRIPTION_NAME (Element)));
+ CreateQuotedString (&pname, (char *)EMPTY (NAMEONPCB_NAME (Element)));
+ CreateQuotedString (&vname, (char *)EMPTY (VALUE_NAME (Element)));
fprintf (FP, "(%s %s %s)\n", cname.Data, pname.Data, vname.Data);
}
@@ -2828,7 +2828,7 @@ PrintPadConnections (Cardinal Layer, FILE * FP, bool IsFirst)
{
ptr = PADLIST_ENTRY (Layer, 0);
if (ptr != NULL)
- PrintConnectionListEntry (UNKNOWN (ptr->Name), NULL, true, FP);
+ PrintConnectionListEntry ((char *)UNKNOWN (ptr->Name), NULL, true, FP);
else
printf ("Skipping NULL ptr in 1st part of PrintPadConnections\n");
}
@@ -2840,7 +2840,7 @@ PrintPadConnections (Cardinal Layer, FILE * FP, bool IsFirst)
{
ptr = PADLIST_ENTRY (Layer, i);
if (ptr != NULL)
- PrintConnectionListEntry (EMPTY (ptr->Name), ptr->Element, false, FP);
+ PrintConnectionListEntry ((char *)EMPTY (ptr->Name), (ElementTypePtr)ptr->Element, false, FP);
else
printf ("Skipping NULL ptr in 2nd part of PrintPadConnections\n");
}
@@ -2863,7 +2863,7 @@ PrintPinConnections (FILE * FP, bool IsFirst)
{
/* the starting pin */
pv = PVLIST_ENTRY (0);
- PrintConnectionListEntry (EMPTY (pv->Name), NULL, true, FP);
+ PrintConnectionListEntry ((char *)EMPTY (pv->Name), NULL, true, FP);
}
/* we maybe have to start with i=1 if we are handling the
@@ -2873,7 +2873,7 @@ PrintPinConnections (FILE * FP, bool IsFirst)
{
/* get the elements name or assume that its a via */
pv = PVLIST_ENTRY (i);
- PrintConnectionListEntry (EMPTY (pv->Name), pv->Element, false, FP);
+ PrintConnectionListEntry ((char *)EMPTY (pv->Name), (ElementTypePtr)pv->Element, false, FP);
}
}
@@ -2902,26 +2902,26 @@ ListsEmpty (bool AndRats)
static bool
DoIt (bool AndRats, bool AndDraw)
{
- bool new = false;
+ bool newone = false;
do
{
/* lookup connections; these are the steps (2) to (4)
* from the description
*/
- new = LookupPVConnectionsToPVList ();
- if (!new)
- new = LookupLOConnectionsToPVList (AndRats);
- if (!new)
- new = LookupLOConnectionsToLOList (AndRats);
- if (!new)
- new = LookupPVConnectionsToLOList (AndRats);
+ newone = LookupPVConnectionsToPVList ();
+ if (!newone)
+ newone = LookupLOConnectionsToPVList (AndRats);
+ if (!newone)
+ newone = LookupLOConnectionsToLOList (AndRats);
+ if (!newone)
+ newone = LookupPVConnectionsToLOList (AndRats);
if (AndDraw)
DrawNewConnections ();
}
- while (!new && !ListsEmpty (AndRats));
+ while (!newone && !ListsEmpty (AndRats));
if (AndDraw)
Draw ();
- return (new);
+ return (newone);
}
/* returns true if nothing un-found touches the passed line
@@ -2980,7 +2980,7 @@ PrintAndSelectUnusedPinsAndPadsOfElement (ElementTypePtr Element, FILE * FP)
}
/* write name to list and draw selected object */
- CreateQuotedString (&oname, EMPTY (pin->Name));
+ CreateQuotedString (&oname, (char *)EMPTY (pin->Name));
fprintf (FP, "\t%s\n", oname.Data);
SET_FLAG (SELECTEDFLAG, pin);
DrawPin (pin, 0);
@@ -3024,7 +3024,7 @@ PrintAndSelectUnusedPinsAndPadsOfElement (ElementTypePtr Element, FILE * FP)
}
/* write name to list and draw selected object */
- CreateQuotedString (&oname, EMPTY (pad->Name));
+ CreateQuotedString (&oname, (char *)EMPTY (pad->Name));
fprintf (FP, "\t%s\n", oname.Data);
SET_FLAG (SELECTEDFLAG, pad);
DrawPad (pad, 0);
@@ -3089,7 +3089,7 @@ PrintElementConnections (ElementTypePtr Element, FILE * FP, bool AndDraw)
/* pin might have been checked before, add to list if not */
if (TEST_FLAG (TheFlag, pin))
{
- PrintConnectionListEntry (EMPTY (pin->Name), NULL, true, FP);
+ PrintConnectionListEntry ((char *)EMPTY (pin->Name), NULL, true, FP);
fputs ("\t\t__CHECKED_BEFORE__\n\t}\n", FP);
continue;
}
@@ -3113,7 +3113,7 @@ PrintElementConnections (ElementTypePtr Element, FILE * FP, bool AndDraw)
/* pad might have been checked before, add to list if not */
if (TEST_FLAG (TheFlag, pad))
{
- PrintConnectionListEntry (EMPTY (pad->Name), NULL, true, FP);
+ PrintConnectionListEntry ((char *)EMPTY (pad->Name), NULL, true, FP);
fputs ("\t\t__CHECKED_BEFORE__\n\t}\n", FP);
continue;
}
@@ -4339,13 +4339,13 @@ DRCAll (void)
BuildObjectList (&object_count, &object_id_list, &object_type_list);
title = _("Element %s has %i silk lines which are too thin");
- name = UNKNOWN (NAMEONPCB_NAME (element));
+ name = (char *)UNKNOWN (NAMEONPCB_NAME (element));
/* -4 is for the %s and %i place-holders */
/* +11 is the max printed length for a 32 bit integer */
/* +1 is for the \0 termination */
buflen = strlen (title) - 4 + strlen (name) + 11 + 1;
- buffer = malloc (buflen);
+ buffer = (char *)malloc (buflen);
snprintf (buffer, buflen, title, name, tmpcnt);
violation = pcb_drc_violation_new (buffer,
@@ -4478,8 +4478,8 @@ BuildObjectList (int *object_count, long int **object_id_list, int **object_type
case ELEMENT_TYPE:
case RATLINE_TYPE:
*object_count = 1;
- *object_id_list = malloc (sizeof (long int));
- *object_type_list = malloc (sizeof (int));
+ *object_id_list = (long int *)malloc (sizeof (long int));
+ *object_type_list = (int *)malloc (sizeof (int));
**object_id_list = ((AnyObjectType *)thing_ptr3)->ID;
**object_type_list = thing_type;
return;
diff --git a/src/free_atexit.c b/src/free_atexit.c
index 501775c..6527a46 100644
--- a/src/free_atexit.c
+++ b/src/free_atexit.c
@@ -48,7 +48,7 @@ void *leaky_malloc (size_t size)
{
void *new_memory = malloc(size + sizeof(leaky_admin_t));
- free_list = realloc (free_list, (free_size + 1) * sizeof(void *));
+ free_list = (void **)realloc (free_list, (free_size + 1) * sizeof(void *));
free_list[free_size] = new_memory;
*(leaky_idx_t *)new_memory = free_size;
diff --git a/src/global.h b/src/global.h
index bb78abc..0420a18 100644
--- a/src/global.h
+++ b/src/global.h
@@ -153,7 +153,7 @@ typedef struct
BoxType BoundingBox; \
long int ID; \
FlagType Flags; \
- struct LibraryEntryType *net
+ // struct LibraryEntryType *net
/* Lines, pads, and rats all use this so they can be cross-cast. */
#define ANYLINEFIELDS \
@@ -434,6 +434,7 @@ typedef struct
*Value, /* the value field */
*Description; /* some descritional text */
} LibraryEntryType, *LibraryEntryTypePtr;
+//typedef LibraryEntryType *LibraryEntryTypePtr;
/* If the internal flag is set, the only field that is valid is Name,
and the struct is allocated with malloc instead of
diff --git a/src/heap.c b/src/heap.c
index fee6412..9e0f35e 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -120,7 +120,7 @@ heap_create ()
MIN_COST = -1e23;
assert (MIN_COST < 0);
/* okay, create empty heap */
- heap = calloc (1, sizeof (*heap));
+ heap = (heap_t *)calloc (1, sizeof (*heap));
assert (heap);
assert (__heap_is_good (heap));
return heap;
@@ -179,7 +179,7 @@ heap_insert (heap_t * heap, cost_t cost, void *data)
if (heap->max == 0)
heap->max = 256; /* default initial heap size */
heap->element =
- realloc (heap->element, heap->max * sizeof (*heap->element));
+ (struct heap_element *)realloc (heap->element, heap->max * sizeof (*heap->element));
}
heap->size++;
assert (heap->size < heap->max);
diff --git a/src/hid.h b/src/hid.h
index 94734ba..b13e75b 100644
--- a/src/hid.h
+++ b/src/hid.h
@@ -161,16 +161,18 @@ extern "C"
double real_value;
} HID_Attr_Val;
+ enum hids
+ { HID_Label, HID_Integer, HID_Real, HID_String,
+ HID_Boolean, HID_Enum, HID_Mixed, HID_Path
+ };
+
typedef struct
{
char *name;
/* If the help_text is this, usage() won't show this option */
#define ATTR_UNDOCUMENTED ((char *)(1))
char *help_text;
- enum
- { HID_Label, HID_Integer, HID_Real, HID_String,
- HID_Boolean, HID_Enum, HID_Mixed, HID_Path
- } type;
+ enum hids type;
int min_val, max_val; /* for integer and real */
HID_Attr_Val default_val; /* Also actual value for global attributes. */
const char **enumerations;
diff --git a/src/hid/bom/bom.c b/src/hid/bom/bom.c
index 04ad123..661b592 100644
--- a/src/hid/bom/bom.c
+++ b/src/hid/bom/bom.c
@@ -90,7 +90,7 @@ CleanBOMString (char *in)
char *out;
int i;
- if ((out = malloc ((strlen (in) + 1) * sizeof (char))) == NULL)
+ if ((out = (char *)malloc ((strlen (in) + 1) * sizeof (char))) == NULL)
{
fprintf (stderr, "Error: CleanBOMString() malloc() failed\n");
exit (1);
@@ -144,25 +144,25 @@ xyToAngle (double x, double y)
static StringList *
string_insert (char *str, StringList * list)
{
- StringList *new, *cur;
+ StringList *newlist, *cur;
- if ((new = (StringList *) malloc (sizeof (StringList))) == NULL)
+ if ((newlist = (StringList *) malloc (sizeof (StringList))) == NULL)
{
fprintf (stderr, "malloc() failed in string_insert()\n");
exit (1);
}
- new->next = NULL;
- new->str = strdup (str);
+ newlist->next = NULL;
+ newlist->str = strdup (str);
if (list == NULL)
- return (new);
+ return (newlist);
cur = list;
while (cur->next != NULL)
cur = cur->next;
- cur->next = new;
+ cur->next = newlist;
return (list);
}
@@ -170,23 +170,23 @@ string_insert (char *str, StringList * list)
static BomList *
bom_insert (char *refdes, char *descr, char *value, BomList * bom)
{
- BomList *new, *cur, *prev = NULL;
+ BomList *newlist, *cur, *prev = NULL;
if (bom == NULL)
{
/* this is the first element so automatically create an entry */
- if ((new = (BomList *) malloc (sizeof (BomList))) == NULL)
+ if ((newlist = (BomList *) malloc (sizeof (BomList))) == NULL)
{
fprintf (stderr, "malloc() failed in bom_insert()\n");
exit (1);
}
- new->next = NULL;
- new->descr = strdup (descr);
- new->value = strdup (value);
- new->num = 1;
- new->refdes = string_insert (refdes, NULL);
- return (new);
+ newlist->next = NULL;
+ newlist->descr = strdup (descr);
+ newlist->value = strdup (value);
+ newlist->num = 1;
+ newlist->refdes = string_insert (refdes, NULL);
+ return (newlist);
}
/* search and see if we already have used one of these
@@ -207,19 +207,19 @@ bom_insert (char *refdes, char *descr, char *value, BomList * bom)
if (cur == NULL)
{
- if ((new = (BomList *) malloc (sizeof (BomList))) == NULL)
+ if ((newlist...
[truncated message content] |
|
From: <gi...@gp...> - 2011-01-23 05:42:48
|
The branch, master has been updated
via 5f0f788dc12a10a3c01ade7cf00d5ed63922ca47 (commit)
from 58b6f969f16124eeda6924178dd0e9281b147f6d (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/lesstif/netlist.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
=================
Commit Messages
=================
commit 5f0f788dc12a10a3c01ade7cf00d5ed63922ca47
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
Add header for Draw() prototype.
Silences a warning building the lesstif hid.
:100644 100644 3645547... 42d1263... M src/hid/lesstif/netlist.c
=========
Changes
=========
commit 5f0f788dc12a10a3c01ade7cf00d5ed63922ca47
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
Add header for Draw() prototype.
Silences a warning building the lesstif hid.
diff --git a/src/hid/lesstif/netlist.c b/src/hid/lesstif/netlist.c
index 3645547..42d1263 100644
--- a/src/hid/lesstif/netlist.c
+++ b/src/hid/lesstif/netlist.c
@@ -21,6 +21,7 @@
#include "undo.h"
#include "remove.h"
#include "crosshair.h"
+#include "draw.h"
#include "hid.h"
#include "../hidint.h"
|
|
From: <gi...@gp...> - 2011-01-23 05:16:17
|
The branch, master has been updated
via 58b6f969f16124eeda6924178dd0e9281b147f6d (commit)
from 13de8601a39f2ed2a18aca814598f3ebe17ff506 (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/edif.y | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit 58b6f969f16124eeda6924178dd0e9281b147f6d
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
FindContext() takes an int, not a pointer.
:100644 100644 1bad8ff... d9dbd8e... M src/edif.y
=========
Changes
=========
commit 58b6f969f16124eeda6924178dd0e9281b147f6d
Author: DJ Delorie <dj...@de...>
Commit: DJ Delorie <dj...@de...>
FindContext() takes an int, not a pointer.
diff --git a/src/edif.y b/src/edif.y
index 1bad8ff..d9dbd8e 100644
--- a/src/edif.y
+++ b/src/edif.y
@@ -4147,7 +4147,7 @@ void ParseEDIF(char* filename,FILE* err)
*/
CSP = (ContextCar *) Malloc(sizeof(ContextCar));
CSP->Next = NULL;
- CSP->Context = FindContext(NULL);
+ CSP->Context = FindContext(0);
CSP->u.Used = NULL;
ContextDefined = 0;
}
|
|
From: Peter C. <pc...@ca...> - 2011-01-15 15:48:06
|
On Sat, 2011-01-15 at 08:39 -0500, Dan McMahill wrote: > > commit 13de8601a39f2ed2a18aca814598f3ebe17ff506 > > Author: Markus Hitter <ma...@ju...> > > Commit: Peter Clifton <pc...@ca...> > > > > INSTALL: add instructions on how to create configure. > > > > Closes-bug: lp-702484 > Since README.git has full details on what to do when working with git > sources (including extra tools, etc), perhaps INSTALL should just say > "Read README.git" instead of "./autogen.sh Neither hurts I think, but perhaps we could consolidate instructions in one file. I'm not working on this, was just committing a patch Markus wrote in response to what amounted to a "Patches Welcome" comment I made in the bug tracker. I've no objections if you want to revise these doc files. -- Peter Clifton Electrical Engineering Division, Engineering Department, University of Cambridge, 9, JJ Thomson Avenue, Cambridge CB3 0FA Tel: +44 (0)7729 980173 - (No signal in the lab!) Tel: +44 (0)1223 748328 - (Shared lab phone, ask for me) |
|
From: Dan M. <da...@mc...> - 2011-01-15 13:39:41
|
On 1/15/2011 4:16 AM, gi...@gp... wrote: > The branch, master has been updated > via 13de8601a39f2ed2a18aca814598f3ebe17ff506 (commit) > from 60bb0194d14f804b1c752b98c681b461683d6b3a (commit) > > > commit 13de8601a39f2ed2a18aca814598f3ebe17ff506 > Author: Markus Hitter <ma...@ju...> > Commit: Peter Clifton <pc...@ca...> > > INSTALL: add instructions on how to create configure. > > Closes-bug: lp-702484 > > :100644 100644 c4df37d... 62fc50e... M INSTALL > > ========= > Changes > ========= > > commit 13de8601a39f2ed2a18aca814598f3ebe17ff506 > Author: Markus Hitter <ma...@ju...> > Commit: Peter Clifton <pc...@ca...> > > INSTALL: add instructions on how to create configure. > > Closes-bug: lp-702484 > > diff --git a/INSTALL b/INSTALL > index c4df37d..62fc50e 100644 > --- a/INSTALL > +++ b/INSTALL > @@ -2,6 +2,14 @@ PCB uses a standard GNU autoconf/automake based build > system which should make compilation go smoothly on most unix-like > systems. Please do read this first section however. > > +If there is no "configure" script, e.g. because you pulled sources > +from the Git repository, make sure you have autopoint and autoconf > +installed, then run: > + > + ./autogen.sh > + > +This will set up and run autoconf to create configure. > + > PCB is organized into a core program that deals with all of the > internal database procedures and a collection of Human Interface > Devices (HID's). The HID's provide exporting/printing capability Since README.git has full details on what to do when working with git sources (including extra tools, etc), perhaps INSTALL should just say "Read README.git" instead of "./autogen.sh -Dan |
|
From: <gi...@gp...> - 2011-01-15 09:17:04
|
The branch, master has been updated
via 13de8601a39f2ed2a18aca814598f3ebe17ff506 (commit)
from 60bb0194d14f804b1c752b98c681b461683d6b3a (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
=========
INSTALL | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
=================
Commit Messages
=================
commit 13de8601a39f2ed2a18aca814598f3ebe17ff506
Author: Markus Hitter <ma...@ju...>
Commit: Peter Clifton <pc...@ca...>
INSTALL: add instructions on how to create configure.
Closes-bug: lp-702484
:100644 100644 c4df37d... 62fc50e... M INSTALL
=========
Changes
=========
commit 13de8601a39f2ed2a18aca814598f3ebe17ff506
Author: Markus Hitter <ma...@ju...>
Commit: Peter Clifton <pc...@ca...>
INSTALL: add instructions on how to create configure.
Closes-bug: lp-702484
diff --git a/INSTALL b/INSTALL
index c4df37d..62fc50e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,6 +2,14 @@ PCB uses a standard GNU autoconf/automake based build
system which should make compilation go smoothly on most unix-like
systems. Please do read this first section however.
+If there is no "configure" script, e.g. because you pulled sources
+from the Git repository, make sure you have autopoint and autoconf
+installed, then run:
+
+ ./autogen.sh
+
+This will set up and run autoconf to create configure.
+
PCB is organized into a core program that deals with all of the
internal database procedures and a collection of Human Interface
Devices (HID's). The HID's provide exporting/printing capability
|