[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (64c875b0662e285dc101e7b2a0392a4c743c8700)
The branch, master has been updated
via 64c875b0662e285dc101e7b2a0392a4c743c8700 (commit)
via 7fb579af50cd41e1bb50a12af4d59003f90f0bbb (commit)
via dc9052b1b4976c3dee3e39290b03ed8da94a7a63 (commit)
from 1099c473dc24b8c1567261235ae3f4916b47cfc7 (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 | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
=================
Commit Messages
=================
commit 64c875b0662e285dc101e7b2a0392a4c743c8700
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
polygon1.c: #ifdef DEBUG_ALL_LABELS build print_labels()
Avoids warnings when building with DEBUG defined, but without
DEBUG_ALL_LABELS.
:100644 100644 30b6c34... 8ee6c30... M src/polygon1.c
commit 7fb579af50cd41e1bb50a12af4d59003f90f0bbb
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
polygon1.c: Tidy up poly_Valid debug print routines to match pline_dump
Avoids a superfluous line:
%d %d 10 10 ""]
at the beginning of each output block.
:100644 100644 44b3ae7... 30b6c34... M src/polygon1.c
commit dc9052b1b4976c3dee3e39290b03ed8da94a7a63
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
polygon1.c: Fixup pline_dump() (debug code) to match correct edge state
The old code would mistakenly annotate with the edge state for the next
edge. From polygon1.c:
/* note that a vertex v's Flags.status represents the edge defined by
* v to v->next (i.e. the edge is forward of v)
*/
:100644 100644 f8e711e... 44b3ae7... M src/polygon1.c
=========
Changes
=========
commit 64c875b0662e285dc101e7b2a0392a4c743c8700
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
polygon1.c: #ifdef DEBUG_ALL_LABELS build print_labels()
Avoids warnings when building with DEBUG defined, but without
DEBUG_ALL_LABELS.
diff --git a/src/polygon1.c b/src/polygon1.c
index 30b6c34..8ee6c30 100644
--- a/src/polygon1.c
+++ b/src/polygon1.c
@@ -919,6 +919,7 @@ theState (VNODE * v)
}
}
+#ifdef DEBUG_ALL_LABELS
static void
print_labels (PLINE * a)
{
@@ -932,6 +933,7 @@ print_labels (PLINE * a)
while ((c = c->next) != &a->head);
}
#endif
+#endif
/*
label_contour
commit 7fb579af50cd41e1bb50a12af4d59003f90f0bbb
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
polygon1.c: Tidy up poly_Valid debug print routines to match pline_dump
Avoids a superfluous line:
%d %d 10 10 ""]
at the beginning of each output block.
diff --git a/src/polygon1.c b/src/polygon1.c
index 44b3ae7..30b6c34 100644
--- a/src/polygon1.c
+++ b/src/polygon1.c
@@ -2386,7 +2386,7 @@ poly_Valid (POLYAREA * p)
if (p->contours->Flags.orient == PLF_INV || poly_ChkContour (p->contours))
{
#ifndef NDEBUG
- VNODE *v;
+ VNODE *v, *n;
DEBUGP ("Invalid Outer PLINE\n");
if (p->contours->Flags.orient == PLF_INV)
DEBUGP ("failed orient\n");
@@ -2395,8 +2395,9 @@ poly_Valid (POLYAREA * p)
v = &p->contours->head;
do
{
- fprintf (stderr, "%d %d 100 100 \"\"]\n", v->point[0], v->point[1]);
- fprintf (stderr, "Line [%d %d ", v->point[0], v->point[1]);
+ n = v->next;
+ fprintf (stderr, "Line [%d %d %d %d 100 100 \"\"]\n",
+ v->point[0], v->point[1], n->point[0], n->point[1]);
}
while ((v = v->next) != &p->contours->head);
#endif
@@ -2408,7 +2409,7 @@ poly_Valid (POLYAREA * p)
poly_ChkContour (c) || !poly_ContourInContour (p->contours, c))
{
#ifndef NDEBUG
- VNODE *v;
+ VNODE *v, *n;
DEBUGP ("Invalid Inner PLINE orient = %d\n", c->Flags.orient);
if (c->Flags.orient == PLF_DIR)
DEBUGP ("failed orient\n");
@@ -2419,9 +2420,9 @@ poly_Valid (POLYAREA * p)
v = &c->head;
do
{
- fprintf (stderr, "%d %d 100 100 \"\"]\n", v->point[0],
- v->point[1]);
- fprintf (stderr, "Line [%d %d ", v->point[0], v->point[1]);
+ n = v->next;
+ fprintf (stderr, "Line [%d %d %d %d 100 100 \"\"]\n",
+ v->point[0], v->point[1], n->point[0], n->point[1]);
}
while ((v = v->next) != &c->head);
#endif
commit dc9052b1b4976c3dee3e39290b03ed8da94a7a63
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
polygon1.c: Fixup pline_dump() (debug code) to match correct edge state
The old code would mistakenly annotate with the edge state for the next
edge. From polygon1.c:
/* note that a vertex v's Flags.status represents the edge defined by
* v to v->next (i.e. the edge is forward of v)
*/
diff --git a/src/polygon1.c b/src/polygon1.c
index f8e711e..44b3ae7 100644
--- a/src/polygon1.c
+++ b/src/polygon1.c
@@ -131,19 +131,17 @@ static char *theState (VNODE * v);
static void
pline_dump (VNODE * v)
{
- VNODE *s;
+ VNODE *s, *n;
s = v;
do
{
- if (v != s)
- fprintf (stderr, "%d %d 10 10 \"%s\"]\n", v->point[0], v->point[1],
- theState (v));
- fprintf (stderr, "Line [%d %d ", v->point[0], v->point[1]);
+ n = v->next;
+ fprintf (stderr, "Line [%d %d %d %d 10 10 \"%s\"]\n",
+ v->point[0], v->point[1],
+ n->point[0], n->point[1], theState (v));
}
while ((v = v->next) != s);
- fprintf (stderr, "%d %d 10 10 \"%s\"]\n", v->point[0], v->point[1],
- theState (v));
fprintf (stderr, "NEXT PLINE\n");
}
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs