From: Matthias Kramm <kramm@quiss.org>
Date: Tue, 25 May 2010 17:09:56 +0000 (-0700)
Subject: Merge branch 'master' into gfxpoly
X-Git-Tag: version-0-9-1~5^2~8
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=6237ee06a828460a9977801b727ffb2bce014353;hp=f2cd87efc4d91982c932ecb13c19d48980209e7a

Merge branch 'master' into gfxpoly
---

diff --git a/lib/gfxpoly/Makefile b/lib/gfxpoly/Makefile
index 7a8b9cc..4e182f7 100644
--- a/lib/gfxpoly/Makefile
+++ b/lib/gfxpoly/Makefile
@@ -1,7 +1,7 @@
 all: test stroke
 include ../../Makefile.common
 
-CC = gcc -O2 -g
+CC = gcc -O2 -g -pg
 #CC = gcc -O3
 
 ../libbase.a: ../q.c ../q.h ../mem.c ../mem.h
@@ -36,11 +36,11 @@ xrow.o: xrow.c xrow.h ../q.h ../mem.h
 stroke.o: stroke.c poly.h convert.h wind.h
 	$(CC) -c stroke.c -o stroke.o
 
-GFX=../gfxfont.o ../gfxtools.o  ../devices/ops.o ../devices/polyops.o ../devices/text.o ../devices/bbox.o ../devices/render.o ../devices/rescale.o ../devices/record.o
+GFX=../gfxfont.o ../gfxtools.o ../gfximage.o  ../devices/ops.o ../devices/polyops.o ../devices/text.o ../devices/bbox.o ../devices/render.o ../devices/rescale.o ../devices/record.o
 stroke: test_stroke.c $(OBJS) ../libgfxswf.a ../librfxswf.a ../libbase.a 
 	$(CC) test_stroke.c $(OBJS) ../libgfxswf.a ../librfxswf.a $(GFX) ../libbase.a -o stroke $(LIBS)
 
-SWF = ../librfxswf.a ../libpdf.a -lstdc++
+SWF = ../librfxswf.a ../libgfxpdf.a -lstdc++
 test: ../libbase.a test.c $(OBJS) poly.h convert.h $(GFX) 
 	$(CC) test.c $(OBJS) $(SWF) $(GFX) ../libbase.a -o test $(LIBS)
 
diff --git a/lib/gfxpoly/active.c b/lib/gfxpoly/active.c
index b723185..ae570fd 100644
--- a/lib/gfxpoly/active.c
+++ b/lib/gfxpoly/active.c
@@ -31,7 +31,7 @@ void actlist_dump(actlist_t*a, int32_t y)
             }
             lastx = x;
         }
-        fprintf(stderr, "[%d]", s->nr);
+        fprintf(stderr, "[%d]", (int)s->nr);
         s = s->right;
         if(s) fprintf(stderr, " ");
         else fprintf(stderr, " y=%d\n", y);
@@ -100,7 +100,7 @@ segment_t* actlist_find(actlist_t*a, point_t p1, point_t p2)
 	    actlist_dump(a, p1.y);
 	    segment_t*s = a->list;
 	    while(s) {
-		fprintf(stderr, "[%d] %f/%f (%d,%d) -> (%d,%d)\n", s->nr,
+		fprintf(stderr, "[%d] %f/%f (%d,%d) -> (%d,%d)\n", SEGNR(s),
 			single_cmp(s,p1), cmp(s,p1,p2),
 			s->a.x, s->a.y, s->b.x, s->b.y);
 		s = s->right;
diff --git a/lib/gfxpoly/convert.c b/lib/gfxpoly/convert.c
index 0a2cc93..28c3b7a 100644
--- a/lib/gfxpoly/convert.c
+++ b/lib/gfxpoly/convert.c
@@ -133,6 +133,7 @@ void finish_segment(compactpoly_t*data)
 	return;
     point_t*p = malloc(sizeof(point_t)*data->num_points);
     gfxpolystroke_t*s = rfx_calloc(sizeof(gfxpolystroke_t));
+    s->fs = &edgestyle_default;
     s->next = data->poly->strokes;
     data->poly->strokes = s;
     s->num_points = s->points_size = data->num_points;
diff --git a/lib/gfxpoly/poly.c b/lib/gfxpoly/poly.c
index eb1b6b1..9ffc770 100644
--- a/lib/gfxpoly/poly.c
+++ b/lib/gfxpoly/poly.c
@@ -165,35 +165,70 @@ int gfxpoly_size(gfxpoly_t*poly)
     return edges;
 }
 
-char gfxpoly_check(gfxpoly_t*poly)
+char gfxpoly_check(gfxpoly_t*poly, char updown)
 {
     current_polygon = poly;
-    dict_t*d = dict_new2(&point_type);
+    dict_t*d1 = dict_new2(&point_type);
+    dict_t*d2 = dict_new2(&point_type);
     int s,t;
     gfxpolystroke_t*stroke = poly->strokes;
     for(;stroke;stroke=stroke->next) {
+	/* In order to not confuse the fill/wind logic, existing segments must have
+	   a non-zero edge style */
+	assert(stroke->fs);
+
+	/* put all the segments into dictionaries so that we can check
+	   that the endpoint multiplicity is two */
 	for(s=0;s<stroke->num_points;s++) {
 	    point_t p = stroke->points[s];
-	    int num = (s>=1 && s<stroke->num_points-1)?2:1; // mid points are two points (start+end)
-	    if(!dict_contains(d, &p)) {
-		dict_put(d, &p, (void*)(ptroff_t)num);
+	    int num_xor = (s>=1 && s<stroke->num_points-1)?2:1; // mid points are two points (start+end)
+	    int num_circ = (s>=1 && s<stroke->num_points-1)?0:(s==0?1:-1);
+	    if(stroke->dir==DIR_UP)
+		num_circ=-num_circ;
+
+	    if(!dict_contains(d1, &p)) {
+		dict_put(d1, &p, (void*)(ptroff_t)num_xor);
+		if(updown) {
+		    assert(!dict_contains(d2, &p));
+		    dict_put(d2, &p, (void*)(ptroff_t)num_circ);
+		}
 	    } else {
-		int count = (ptroff_t)dict_lookup(d, &p);
-		dict_del(d, &p);
-		count+=num;
-		dict_put(d, &p, (void*)(ptroff_t)count);
+		int count = (ptroff_t)dict_lookup(d1, &p);
+		dict_del(d1, &p);
+		count+=num_xor;
+		dict_put(d1, &p, (void*)(ptroff_t)count);
+
+		if(updown) {
+		    assert(dict_contains(d2, &p));
+		    count = (ptroff_t)dict_lookup(d2, &p);
+		    dict_del(d2, &p);
+		    count+=num_circ;
+		    dict_put(d2, &p, (void*)(ptroff_t)count);
+		}
 	    }
 	}
     }
-    DICT_ITERATE_ITEMS(d, point_t*, p, void*, c) {
-        int count = (ptroff_t)c;
+    DICT_ITERATE_ITEMS(d1, point_t*, p1, void*, c1) {
+        int count = (ptroff_t)c1;
         if(count&1) {
-            fprintf(stderr, "Point (%f,%f) occurs %d times\n", p->x*poly->gridsize, p->y*poly->gridsize, count);
-            dict_destroy(d);
-            return 0;
+            fprintf(stderr, "Point (%d,%d) occurs %d times\n", p1->x, p1->y, count);
+            dict_destroy(d1);
+	    return 0;
         }
     }
-    dict_destroy(d);
+    if(updown) {
+	DICT_ITERATE_ITEMS(d2, point_t*, p2, void*, c2) {
+	    int count = (ptroff_t)c2;
+	    if(count!=0) {
+		if(count>0) fprintf(stderr, "Point (%d,%d) has %d more incoming than outgoing segments\n", p2->x, p2->y, count);
+		if(count<0) fprintf(stderr, "Point (%d,%d) has %d more outgoing than incoming segments\n", p2->x, p2->y, -count);
+		dict_destroy(d2);
+		return 0;
+	    }
+	}
+    }
+    dict_destroy(d1);
+    dict_destroy(d2);
     return 1;
 }
 
@@ -201,15 +236,24 @@ void gfxpoly_dump(gfxpoly_t*poly)
 {
     int s,t;
     double g = poly->gridsize;
-    fprintf(stderr, "polyon %08x (gridsize: %f)\n", (int)poly, poly->gridsize);
+    fprintf(stderr, "polyon %p (gridsize: %f)\n", poly, poly->gridsize);
     gfxpolystroke_t*stroke = poly->strokes;
     for(;stroke;stroke=stroke->next) {
-	fprintf(stderr, "%08x", (int)stroke);
-	for(s=0;s<stroke->num_points-1;s++) {
-	    point_t a = stroke->points[s];
-	    point_t b = stroke->points[s+1];
-	    fprintf(stderr, "%s (%f,%f) -> (%f,%f)%s\n", s?"        ":"", a.x*g, a.y*g, b.x*g, b.y*g,
-		                                        s==stroke->num_points-2?"]":"");
+	fprintf(stderr, "%11p", stroke);
+	if(stroke->dir==DIR_UP) {
+	    for(s=stroke->num_points-1;s>=1;s--) {
+		point_t a = stroke->points[s];
+		point_t b = stroke->points[s-1];
+		fprintf(stderr, "%s (%f,%f) -> (%f,%f)%s%s\n", s!=stroke->num_points-1?"           ":"", a.x*g, a.y*g, b.x*g, b.y*g,
+							    s==1?"]":"", a.y==b.y?"H":"");
+	    }
+	} else {
+	    for(s=0;s<stroke->num_points-1;s++) {
+		point_t a = stroke->points[s];
+		point_t b = stroke->points[s+1];
+		fprintf(stderr, "%s (%f,%f) -> (%f,%f)%s%s\n", s?"           ":"", a.x*g, a.y*g, b.x*g, b.y*g,
+							    s==stroke->num_points-2?"]":"", a.y==b.y?"H":"");
+	    }
 	}
     }
 }
@@ -235,6 +279,50 @@ void gfxpoly_save(gfxpoly_t*poly, const char*filename)
     fclose(fi);
 }
 
+void gfxpoly_save_arrows(gfxpoly_t*poly, const char*filename)
+{
+    FILE*fi = fopen(filename, "wb");
+    fprintf(fi, "%% gridsize %f\n", poly->gridsize);
+    fprintf(fi, "%% begin\n");
+    int t;
+    double l = 5.0 / poly->gridsize;
+    double g = poly->gridsize;
+    gfxpolystroke_t*stroke = poly->strokes;
+    for(;stroke;stroke=stroke->next) {
+	fprintf(fi, "%g setgray\n", 0);
+
+	int s = stroke->dir==DIR_UP?stroke->num_points-1:0;
+	int end = stroke->dir==DIR_UP?-1:stroke->num_points;
+	int dir = stroke->dir==DIR_UP?-1:1;
+
+	point_t p = stroke->points[s];
+	s+=dir;
+	point_t o = p;
+	fprintf(fi, "%f %f moveto\n", p.x * g, p.y * g);
+	for(;s!=end;s+=dir) {
+	    p = stroke->points[s];
+	    int lx = p.x - o.x;
+	    int ly = p.y - o.y;
+	    double d = sqrt(lx*lx+ly*ly);
+	    if(!d) d=1;
+	    else   d = l / d;
+	    double d2 = d*1.5;
+	    fprintf(fi, "%f %f lineto\n", (p.x - lx*d2) * g, (p.y - ly*d2) * g);
+	    fprintf(fi, "%f %f lineto\n", (p.x - lx*d2 + (ly*d))*g,
+		                          (p.y - ly*d2 - (lx*d))*g);
+	    fprintf(fi, "%f %f lineto\n", p.x * g, p.y * g);
+	    fprintf(fi, "%f %f lineto\n", (p.x - lx*d2 - (ly*d))*g, 
+		                          (p.y - ly*d2 + (lx*d))*g);
+	    fprintf(fi, "%f %f lineto\n", (p.x - lx*d2) * g, (p.y - ly*d2) * g);
+	    fprintf(fi, "%f %f moveto\n", p.x * g, p.y * g);
+	    o = p;
+	}
+	fprintf(fi, "stroke\n");
+    }
+    fprintf(fi, "showpage\n");
+    fclose(fi);
+}
+
 inline static event_t* event_new()
 {
     event_t*e = rfx_calloc(sizeof(event_t));
@@ -248,13 +336,13 @@ inline static void event_free(event_t*e)
 static void event_dump(event_t*e)
 {
     if(e->type == EVENT_HORIZONTAL) {
-        fprintf(stderr, "Horizontal [%d] (%d,%d) -> (%d,%d)\n", e->s1->nr, e->s1->a.x, e->s1->a.y, e->s1->b.x, e->s1->b.y);
+        fprintf(stderr, "Horizontal [%d] (%d,%d) -> (%d,%d)\n", (int)e->s1->nr, e->s1->a.x, e->s1->a.y, e->s1->b.x, e->s1->b.y);
     } else if(e->type == EVENT_START) {
-        fprintf(stderr, "event: segment [%d] starts at (%d,%d)\n", e->s1->nr, e->p.x, e->p.y);
+        fprintf(stderr, "event: segment [%d] starts at (%d,%d)\n", (int)e->s1->nr, e->p.x, e->p.y);
     } else if(e->type == EVENT_END) {
-        fprintf(stderr, "event: segment [%d] ends at (%d,%d)\n", e->s1->nr, e->p.x, e->p.y);
+        fprintf(stderr, "event: segment [%d] ends at (%d,%d)\n", (int)e->s1->nr, e->p.x, e->p.y);
     } else if(e->type == EVENT_CROSS) {
-        fprintf(stderr, "event: segment [%d] and [%d] intersect at (%d,%d)\n", e->s1->nr, e->s2->nr, e->p.x, e->p.y);
+        fprintf(stderr, "event: segment [%d] and [%d] intersect at (%d,%d)\n", (int)e->s1->nr, (int)e->s2->nr, e->p.x, e->p.y);
     } else {
         assert(0);
     }
@@ -265,9 +353,9 @@ static inline int32_t min32(int32_t v1, int32_t v2) {return v1<v2?v1:v2;}
 
 static void segment_dump(segment_t*s)
 {
-    fprintf(stderr, "[%d] (%d,%d)->(%d,%d) ", s->nr, s->a.x, s->a.y, s->b.x, s->b.y);
-    fprintf(stderr, " dx:%d dy:%d k:%f dx/dy=%f\n", s->delta.x, s->delta.y, s->k,
-            (double)s->delta.x / s->delta.y);
+    fprintf(stderr, "[%d] (%d,%d)->(%d,%d) ", (int)s->nr, s->a.x, s->a.y, s->b.x, s->b.y);
+    fprintf(stderr, " dx:%d dy:%d k:%f dx/dy=%f fs=%p\n", s->delta.x, s->delta.y, s->k,
+            (double)s->delta.x / s->delta.y, s->fs);
 }
 
 static void segment_init(segment_t*s, int32_t x1, int32_t y1, int32_t x2, int32_t y2, int polygon_nr, segment_dir_t dir)
@@ -361,13 +449,14 @@ static void advance_stroke(queue_t*queue, hqueue_t*hqueue, gfxpolystroke_t*strok
     while(pos < stroke->num_points-1) {
 	assert(stroke->points[pos].y <= stroke->points[pos+1].y);
 	s = segment_new(stroke->points[pos], stroke->points[pos+1], polygon_nr, stroke->dir);
+	s->fs = stroke->fs;
 	pos++;
 	s->stroke = 0;
 	s->stroke_pos = 0;
 #ifdef DEBUG
 	/*if(l->tmp)
 	    s->nr = l->tmp;*/
-	fprintf(stderr, "[%d] (%d,%d) -> (%d,%d) %s (stroke %08x, %d more to come)\n",
+	fprintf(stderr, "[%d] (%d,%d) -> (%d,%d) %s (stroke %p, %d more to come)\n",
 		s->nr, s->a.x, s->a.y, s->b.x, s->b.y,
 		s->dir==DIR_UP?"up":"down", stroke, stroke->num_points - 1 - pos);
 #endif
@@ -658,9 +747,8 @@ static void insert_point_into_segment(status_t*status, segment_t*s, point_t p)
         fprintf(stderr, "[%d] receives next point (%d,%d)->(%d,%d) (drawing)\n", s->nr,
                 s->pos.x, s->pos.y, p.x, p.y);
 #endif
-	/* XXX we probably will never output circular/anticircular polygons, but if
-	   we do, we would need to set the segment direction here */
-	fillstyle_t*fs = s->fs_out;
+	edgestyle_t*fs = s->fs_out;
+	segment_dir_t dir = s->wind.is_filled?DIR_DOWN:DIR_UP;
 
         // omit horizontal lines
         if(s->pos.y != p.y) {
@@ -669,15 +757,17 @@ static void insert_point_into_segment(status_t*status, segment_t*s, point_t p)
             assert(a.y != b.y);
 
             gfxpolystroke_t*stroke = status->strokes;
+	    /* find a stoke to attach this segment to. It has to have an endpoint
+	       matching our start point, and a matching edgestyle */
 	    while(stroke) {
 		point_t p = stroke->points[stroke->num_points-1];
-		if(p.x == a.x && p.y == a.y && stroke->fs == fs)
+		if(p.x == a.x && p.y == a.y && stroke->fs == fs && stroke->dir == dir)
 		    break;
 		stroke = stroke->next;
 	    }
 	    if(!stroke) {
 		stroke = rfx_calloc(sizeof(gfxpolystroke_t));
-		stroke->dir = DIR_DOWN;
+		stroke->dir = dir;
 		stroke->fs = fs;
 		stroke->next = status->strokes;
 		status->strokes = stroke;
@@ -686,6 +776,7 @@ static void insert_point_into_segment(status_t*status, segment_t*s, point_t p)
 		stroke->points[0] = a;
 		stroke->num_points = 1;
 	    } else if(stroke->num_points == stroke->points_size) {
+		assert(stroke->fs);
 		stroke->points_size *= 2;
 		stroke->points = rfx_realloc(stroke->points, sizeof(point_t)*stroke->points_size);
 	    }
@@ -913,7 +1004,7 @@ static void recalculate_windings(status_t*status, segrange_t*range)
     s = range->segmin;
 #endif
 #ifdef CHECKS
-    /* test sanity: check that we don't have changed segments
+    /* test sanity: verify that we don't have changed segments
        outside of the given range */
     s = actlist_leftmost(status->actlist);
     while(s && s!=range->segmin) {
@@ -926,7 +1017,7 @@ static void recalculate_windings(status_t*status, segrange_t*range)
         s = s->left;
     }
     /* in check mode, go through the whole interval so we can test
-       that all polygons where the fillstyle changed also have seg->changed=1 */
+       that all polygons where the edgestyle changed also have seg->changed=1 */
     s = actlist_leftmost(status->actlist);
     end = 0;
 #endif
@@ -941,7 +1032,7 @@ static void recalculate_windings(status_t*status, segrange_t*range)
             segment_t* left = actlist_left(status->actlist, s);
             windstate_t wind = left?left->wind:status->windrule->start(status->context);
             s->wind = status->windrule->add(status->context, wind, s->fs, s->dir, s->polygon_nr);
-            fillstyle_t*fs_old = s->fs_out;
+            edgestyle_t*fs_old = s->fs_out;
             s->fs_out = status->windrule->diff(&wind, &s->wind);
 
 #ifdef DEBUG
@@ -1096,7 +1187,7 @@ static void check_status(status_t*status)
             s->pos.y != s->b.y) &&
            !dict_contains(status->segs_with_point, s)) {
             fprintf(stderr, "Error: segment [%d] (%sslope) intersects in scanline %d, but it didn't receive a point\n",
-                    s->nr,
+                    SEGNR(s),
                     s->delta.x<0?"-":"+",
                     status->y);
             assert(0);
@@ -1128,7 +1219,6 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c
     while(e) {
         int32_t y = e->p.y;
         int32_t x = 0;
-        char fill = 0;
 #ifdef DEBUG
         fprintf(stderr, "HORIZONTALS ----------------------------------- %d\n", y);
         actlist_dump(actlist, y-1);
@@ -1136,11 +1226,13 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c
 #ifdef CHECKS
         actlist_verify(actlist, y-1);
 #endif
+	edgestyle_t*fill = 0;
+	int wind = 0;
+
         do {
+	    assert(e->s1->fs);
             if(fill && x != e->p.x) {
-#ifdef DEBUG
-                fprintf(stderr, "%d) draw horizontal line from %d to %d\n", y, x, e->p.x);
-#endif
+		assert(abs(wind)==1);
 		assert(x<e->p.x);
 
                 gfxpolystroke_t*stroke = rfx_calloc(sizeof(gfxpolystroke_t));
@@ -1149,31 +1241,38 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c
 
 		stroke->num_points = 2;
 		stroke->points = malloc(sizeof(point_t)*2);
-		stroke->dir = DIR_UP; // FIXME
-		stroke->fs = 0;
+
+		if(wind>0) {
+		    stroke->dir = DIR_DOWN;
+		} else {
+		    stroke->dir = DIR_UP;
+		}
+#ifdef DEBUG
+                fprintf(stderr, "%d) draw horizontal line from %d to %d (dir=%s)\n", y, x, e->p.x, stroke->dir==DIR_UP?"up":"down");
+#endif
+
+		stroke->fs = fill;
 		point_t a,b;
                 a.y = b.y = y;
-		/* we draw from low x to high x so that left/right fillstyles add up
-                   (because the horizontal line's fill style controls the area *below* the line)
-		 */
-                a.x = e->p.x;
-                b.x = x;
+                a.x = x;
+                b.x = e->p.x;
 		stroke->points[0] = a;
 		stroke->points[1] = b;
 #ifdef CHECKS
 		/* the output should always be intersection free polygons, so check this horizontal
-		   line isn't hacking through any segments in the active list */
-		segment_t* start = actlist_find(actlist, b, b);
-		segment_t* s = actlist_find(actlist, a, a);
+		   line isn't puncturing any segments in the active list */
+		segment_t* start = actlist_find(actlist, a, a);
+		segment_t* s = actlist_find(actlist, b, b);
 		while(s!=start) {
 		    assert(s->a.y == y || s->b.y == y);
 		    s = s->left;
 		}
 #endif
             }
+
+	    segment_t*s = e->s1;
+
             segment_t*left = 0;
-            segment_t*s = e->s1;
-    
             switch(e->type) {
                 case EVENT_START: {
 		    assert(e->p.x == s->a.x && e->p.y == s->a.y);
@@ -1185,25 +1284,50 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c
                     e->s2 = 0;
                     hqueue_put(&hqueue, e);
                     left = actlist_left(actlist, s);
+		    wind += e->s1->dir==DIR_DOWN?-1:1;
                     break;
                 }
                 case EVENT_END: {
                     left = actlist_left(actlist, s);
                     actlist_delete(actlist, s);
 		    advance_stroke(0, &hqueue, s->stroke, s->polygon_nr, s->stroke_pos);
+		    wind += e->s1->dir==DIR_DOWN?1:-1;
                     break;
                 }
                 default: assert(0);
             }
 
             x = e->p.x;
-            fill ^= 1;//(before.is_filled != after.is_filled);
+		
+	    fill = fill?0:&edgestyle_default;
+#if 0
+	    if(windrule==&windrule_evenodd) {
+		if(!!fill != !!fill2) {
+		    segment_dump(s);
+		    event_dump(e);
+		    printf("at y=%d x=%d (hline:%p)\n", e->p.y, x, old_fill);
+		    if(e->type==EVENT_END) {
+			printf("            %9p\n", s->fs);
+			printf("               |\n");
+		    }
+		    printf("              %3d %c%2d \n", before1.is_filled, e->type==EVENT_END?'|':' ', after1.is_filled);
+		    printf("%12p -----+----- %p\n", old_fill, fill2);
+		    printf("              %3d %c%2d \n", before2.is_filled, e->type==EVENT_START?'|':' ', after2.is_filled);
+		    if(e->type==EVENT_START) {
+			printf("                  |\n");
+			printf("             %9p\n", s->fs);
+		    }
+		}
+		assert(!!fill == !!fill2);
+	    }
+#endif
+
 #ifdef DEBUG
-            fprintf(stderr, "%d) event=%s[%d] left:[%d] x:%d\n",
+            fprintf(stderr, "%d) event=%s[%d] left:[%d] x:%d dir:%s\n",
                     y, e->type==EVENT_START?"start":"end",
                     s->nr,
                     left?left->nr:-1,
-                    x);
+                    x, s->dir==DIR_UP?"up":"down");
 #endif
 
             if(e->type == EVENT_END)
@@ -1214,8 +1338,15 @@ static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*c
         } while(e && y == e->p.y);
 
 #ifdef CHECKS
-	char bleeding = fill;
+	edgestyle_t*bleeding = fill;
         assert(!bleeding);
+	segment_t*s = actlist_leftmost(actlist);
+	int dir = 0;
+	while(s) {
+	    dir += s->dir==DIR_UP?-1:1;
+	    s = actlist_right(actlist, s);
+	}
+	assert(!dir);
 #endif
     }
 
@@ -1249,6 +1380,7 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule
 
     event_t*e = queue_get(&status.queue);
     while(e) {
+	assert(e->s1->fs);
         status.y = e->p.y;
 #ifdef CHECKS
 	assert(status.y>=lasty);
@@ -1300,7 +1432,18 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule
     p->gridsize = poly1->gridsize;
     p->strokes = status.strokes;
 
+#ifdef CHECKS
+    /* we only add segments with non-empty edgestyles to strokes in
+       recalculate_windings, but better safe than sorry */
+    gfxpolystroke_t*stroke = p->strokes;
+    while(stroke) {
+	assert(stroke->fs);
+	stroke = stroke->next;
+    }
+#endif
+
     add_horizontals(p, &windrule_evenodd, context); // output is always even/odd
+    //add_horizontals(p, windrule, context);
     return p;
 }
 
diff --git a/lib/gfxpoly/poly.h b/lib/gfxpoly/poly.h
index 68eec9b..ccbf65e 100644
--- a/lib/gfxpoly/poly.h
+++ b/lib/gfxpoly/poly.h
@@ -4,15 +4,15 @@
 #include <stdint.h>
 #include "../q.h"
 #include "../types.h"
+#include "wind.h"
 
 //#define DEBUG
-//#define CHECKS
+#define CHECKS
 
 /* features */
 #define SPLAY
 #define DONT_REMEMBER_CROSSINGS
 
-typedef enum {DIR_UP, DIR_DOWN, DIR_UNKNOWN} segment_dir_t;
 typedef enum {EVENT_CROSS, EVENT_END, EVENT_START, EVENT_HORIZONTAL} eventtype_t;
 typedef enum {SLOPE_POSITIVE, SLOPE_NEGATIVE} slope_t;
 
@@ -23,37 +23,14 @@ typedef struct _point {
 } point_t;
 type_t point_type;
 
-typedef struct _fillstyle {
-    void*internal;
-} fillstyle_t;
-
-typedef struct _windstate
-{
-    char is_filled;
-    int wind_nr;
-} windstate_t;
-
-/* TODO: maybe we should merge windcontext and windrule */
-typedef struct _windcontext
-{
-    int num_polygons;
-} windcontext_t;
-
-typedef struct _windrule
-{
-    windstate_t (*start)(windcontext_t* num_polygons);
-    windstate_t (*add)(windcontext_t*context, windstate_t left, fillstyle_t*edge, segment_dir_t dir, int polygon_nr);
-    fillstyle_t* (*diff)(windstate_t*left, windstate_t*right);
-} windrule_t;
-
-#define SEGNR(s) ((s)?(s)->nr:-1)
+#define SEGNR(s) ((int)((s)?(s)->nr:-1))
 
 typedef struct _gfxpolystroke {
     segment_dir_t dir;
+    edgestyle_t*fs;
     int points_size;
     int num_points;
     point_t*points;
-    fillstyle_t*fs;
     struct _gfxpolystroke*next;
 } gfxpolystroke_t;
 typedef struct _gfxpoly {
@@ -69,8 +46,8 @@ typedef struct _segment {
     int32_t minx, maxx;
     
     segment_dir_t dir;
-    fillstyle_t*fs;
-    fillstyle_t*fs_out;
+    edgestyle_t*fs;
+    edgestyle_t*fs_out;
 #ifdef CHECKS
     char fs_out_ok;
 #endif
@@ -116,11 +93,12 @@ typedef struct _segment {
 
 void gfxpoly_fail(char*expr, char*file, int line, const char*function);
 
-char gfxpoly_check(gfxpoly_t*poly);
+char gfxpoly_check(gfxpoly_t*poly, char updown);
 int gfxpoly_num_segments(gfxpoly_t*poly);
 int gfxpoly_size(gfxpoly_t*poly);
 void gfxpoly_dump(gfxpoly_t*poly);
 void gfxpoly_save(gfxpoly_t*poly, const char*filename);
+void gfxpoly_save_arrows(gfxpoly_t*poly, const char*filename);
 gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule, windcontext_t*context);
 
 gfxpoly_t* gfxpoly_intersect(gfxpoly_t*p1, gfxpoly_t*p2);
diff --git a/lib/gfxpoly/renderpoly.c b/lib/gfxpoly/renderpoly.c
index 240859d..989dfc8 100644
--- a/lib/gfxpoly/renderpoly.c
+++ b/lib/gfxpoly/renderpoly.c
@@ -7,7 +7,7 @@ typedef struct _renderpoint
 {
     double x;
     segment_dir_t dir;
-    fillstyle_t*fs;
+    edgestyle_t*fs;
     int polygon_nr;
 } renderpoint_t;
 
@@ -27,7 +27,7 @@ typedef struct _renderbuf
     renderline_t*lines;
 } renderbuf_t;
 
-static inline void add_pixel(renderbuf_t*buf, double x, int y, segment_dir_t dir, fillstyle_t*fs, int polygon_nr)
+static inline void add_pixel(renderbuf_t*buf, double x, int y, segment_dir_t dir, edgestyle_t*fs, int polygon_nr)
 {
     renderpoint_t p;
     p.x = x;
@@ -48,7 +48,7 @@ static inline void add_pixel(renderbuf_t*buf, double x, int y, segment_dir_t dir
     l->num++;
 }
 #define CUT 0.5
-static void add_line(renderbuf_t*buf, double x1, double y1, double x2, double y2, fillstyle_t*fs, int polygon_nr)
+static void add_line(renderbuf_t*buf, double x1, double y1, double x2, double y2, edgestyle_t*fs, segment_dir_t dir, int polygon_nr)
 {
     x1 *= buf->zoom;
     y1 *= buf->zoom;
@@ -56,13 +56,14 @@ static void add_line(renderbuf_t*buf, double x1, double y1, double x2, double y2
     y2 *= buf->zoom;
     double diffx, diffy;
     double ny1, ny2, stepx;
-    segment_dir_t dir = DIR_DOWN;
+
     if(y2 < y1) {
-        dir = DIR_UP;
+        dir ^= DIR_UP^DIR_DOWN;
         double x,y;
 	x = x1;x1 = x2;x2=x;
 	y = y1;y1 = y2;y2=y;
     }
+
     diffx = x2 - x1;
     diffy = y2 - y1;
     ny1 = floor(y1)+CUT;
@@ -86,6 +87,8 @@ static void add_line(renderbuf_t*buf, double x1, double y1, double x2, double y2
     double posx=0;
     double startx = x1;
 
+    //printf("line %d from %f to %f dir=%s\n", polygon_nr, y1, y2, dir==DIR_UP?"up":"down");
+
     while(posy<=endy) {
         double xx = startx + posx;
         add_pixel(buf, xx, posy, dir, fs, polygon_nr);
@@ -145,7 +148,7 @@ unsigned char* render_polygon(gfxpoly_t*polygon, intbbox_t*bbox, double zoom, wi
 	for(t=0;t<stroke->num_points-1;t++) {
 	    point_t a = stroke->points[t];
 	    point_t b = stroke->points[t+1];
-	    add_line(buf, a.x, a.y, b.x, b.y, stroke->fs, polygon_nr);
+	    add_line(buf, a.x, a.y, b.x, b.y, stroke->fs, stroke->dir, polygon_nr);
 	}
     }
 
@@ -175,10 +178,12 @@ unsigned char* render_polygon(gfxpoly_t*polygon, intbbox_t*bbox, double zoom, wi
         }
         if(fill.is_filled && lastx!=buf->width) {
             /* we're bleeding, fill over padding, too. */
-            fprintf(stderr, "Polygon %08x is bleeding in line %d\n", (int)polygon, y);
+            fprintf(stderr, "Polygon %p is bleeding in line %d\n", polygon, y);
             fill_bitwise(line, lastx, width8*8);
 	    assert(line[width8-1]&0x01);
 	    bleeding = 1;
+	    exit(1);
+
         }
     }
     
diff --git a/lib/gfxpoly/stroke.c b/lib/gfxpoly/stroke.c
index 9735c1b..b9ccb10 100644
--- a/lib/gfxpoly/stroke.c
+++ b/lib/gfxpoly/stroke.c
@@ -225,7 +225,7 @@ gfxpoly_t* gfxpoly_from_stroke(gfxline_t*line, gfxcoord_t width, gfx_capType cap
     gfxdrawer_target_poly(&d, gridsize);
     draw_stroke(line, &d, width, cap_style, joint_style, miterLimit);
     gfxpoly_t*poly = (gfxpoly_t*)d.result(&d);
-    assert(gfxpoly_check(poly));
+    assert(gfxpoly_check(poly, 1));
     gfxpoly_t*poly2 = gfxpoly_process(poly, 0, &windrule_circular, &onepolygon);
     gfxpoly_destroy(poly);
     return poly2;
diff --git a/lib/gfxpoly/test.c b/lib/gfxpoly/test.c
index b5c192a..a7ba9d7 100644
--- a/lib/gfxpoly/test.c
+++ b/lib/gfxpoly/test.c
@@ -173,14 +173,14 @@ int test0(int argn, char*argv[])
     gfxline_t*box3 = gfxline_makerectangle(-100,-100,100,100);
     //gfxline_append(box2, box3);
 
-    gfxpoly_check(gfxpoly_from_stroke(box1, 2.0, gfx_capRound, gfx_joinRound, 0, 0.05));
+    gfxpoly_check(gfxpoly_from_stroke(box1, 2.0, gfx_capRound, gfx_joinRound, 0, 0.05), 1);
 
     gfxmatrix_t matrix;
     memset(&matrix, 0, sizeof(gfxmatrix_t));
     double ua=M_PI/4;
     matrix.m00=cos(ua);matrix.m10=sin(ua);
     matrix.m01=-sin(ua);matrix.m11=cos(ua);
-    //gfxline_transform(box1, &matrix);
+    gfxline_transform(box1, &matrix);
     
     //gfxline_t*b = 0;
     //b = gfxline_append(b, box1);
@@ -192,9 +192,13 @@ int test0(int argn, char*argv[])
     
     gfxline_free(box1);
     gfxline_free(box2);
+    
+    //gfxpoly_t*poly3 = gfxpoly_process(poly1, poly2, &windrule_intersect, &twopolygons);
     gfxpoly_t*poly3 = gfxpoly_process(poly1, poly2, &windrule_intersect, &twopolygons);
     gfxpoly_dump(poly3);
+    
     gfxline_t*line = gfxline_from_gfxpoly(poly3);
+
     gfxline_dump(line, stdout, "");
     gfxline_free(line);
     gfxpoly_destroy(poly1);
@@ -207,22 +211,28 @@ int test1(int argn, char*argv[])
 {
     gfxline_t*box1 = gfxline_makerectangle(50,50,150,150);
     gfxline_t*box2 = gfxline_makerectangle(100,100,200,200);
-    gfxline_t*box3 = gfxline_makerectangle(100,100,200,200);
+    gfxline_t*box3 = gfxline_makerectangle(200,100,300,200);
+    gfxline_t*box4 = gfxline_makerectangle(300,200,400,400);
+    gfxline_t* board = mkchessboard();
     gfxline_t*star = mkstar(50,50, 150,150);
     gfxline_t*b = 0;
     b = gfxline_append(b, box1);
     b = gfxline_append(b, box2);
     b = gfxline_append(b, box3);
+    b = gfxline_append(b, box4);
 
     gfxmatrix_t matrix;
     memset(&matrix, 0, sizeof(gfxmatrix_t));
-    double ua=0.1;
-    matrix.m00=cos(ua);matrix.m10=sin(ua);
-    matrix.m01=-sin(ua);matrix.m11=cos(ua);
+    matrix.m00 = 1.0;
+    matrix.m11 = 1.0;
+    matrix.tx = 200;
+    matrix.ty = 200;
+    gfxline_transform(board, &matrix);
+    b = gfxline_append(b, board);
 
     //gfxline_transform(b, &matrix);
 
-    gfxline_dump(b, stderr, "");
+    //gfxline_dump(b, stderr, "");
     gfxpoly_t*poly = gfxpoly_from_fill(b, 0.05);
     
     gfxline_free(box1);
@@ -230,8 +240,10 @@ int test1(int argn, char*argv[])
     gfxline_free(box3);
     gfxline_free(star);
 
-    gfxpoly_dump(poly);
+    //gfxpoly_dump(poly);
     gfxpoly_t*poly2 = gfxpoly_process(poly, 0, &windrule_evenodd, &onepolygon);
+    //gfxpoly_dump(poly2);
+    gfxpoly_save_arrows(poly2, "test.ps");
     gfxpoly_destroy(poly);
     gfxpoly_destroy(poly2);
 }
@@ -439,18 +451,19 @@ void test4(int argn, char*argv[])
 
         double zoom = 1.0;
 
-        if(!gfxpoly_check(poly1)) {
+        if(!gfxpoly_check(poly1, 0)) {
             printf("bad polygon\n");
             continue;
         }
 
         gfxpoly_t*poly2 = gfxpoly_process(poly1, 0, rule, &onepolygon);
+	assert(gfxpoly_check(poly2, 1));
 
 	int pass;
 	for(pass=0;pass<2;pass++) {
 	    intbbox_t bbox = intbbox_from_polygon(poly1, zoom);
 	    unsigned char*bitmap1 = render_polygon(poly1, &bbox, zoom, rule, &onepolygon);
-	    unsigned char*bitmap2 = render_polygon(poly2, &bbox, zoom, &windrule_evenodd, &onepolygon);
+	    unsigned char*bitmap2 = render_polygon(poly2, &bbox, zoom, &windrule_circular, &onepolygon);
 	    if(!bitmap_ok(&bbox, bitmap1) || !bitmap_ok(&bbox, bitmap2)) {
 		save_two_bitmaps(&bbox, bitmap1, bitmap2, "error.png");
 		assert(!"error in bitmaps");
@@ -461,7 +474,7 @@ void test4(int argn, char*argv[])
 	    }
 	    free(bitmap1);
 	    free(bitmap2);
-	    
+
 	    // second pass renders the 90° rotated version
 	    rotate90(poly1);
 	    rotate90(poly2);
@@ -507,7 +520,7 @@ void extract_polygons_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
 	fprintf(stderr, "%d segments (max so far: %d/%d)\n", size, max_segments, max_any_segments);
     }
 
-    if(!gfxpoly_check(poly1)) {
+    if(!gfxpoly_check(poly1, 0)) {
         gfxpoly_destroy(poly1);
         fprintf(stderr, "bad polygon\n");
         return;
@@ -594,6 +607,7 @@ finish: 0,
 internal: 0
 };
 
+#if 0
 void test5(int argn, char*argv[])
 {
     gfxsource_t*driver = gfxsource_pdf_create();
@@ -629,9 +643,10 @@ void test5(int argn, char*argv[])
     closedir(_dir);
     driver->destroy(driver);
 }
+#endif
 
 int main(int argn, char*argv[])
 {
-    test0(argn, argv);
+    test4(argn, argv);
 }
 
diff --git a/lib/gfxpoly/test_stroke.c b/lib/gfxpoly/test_stroke.c
index 0e292cd..06ae2b6 100644
--- a/lib/gfxpoly/test_stroke.c
+++ b/lib/gfxpoly/test_stroke.c
@@ -77,7 +77,7 @@ int test_stroke1()
 
 	//gfxpoly_t*p = gfxpoly_fromstroke(l, width, gfx_capRound, gfx_joinRound, 500);
 	gfxpoly_t*p1 = gfxpoly_from_stroke(l, width, gfx_capRound, gfx_joinRound, 500, 0.05);
-	assert(gfxpoly_check(p1));
+	assert(gfxpoly_check(p1, 1));
 	
 	//gfxpoly_t*p2 = gfxpoly_from_fill(f, 0.05);
 	gfxline_t*l2 = gfxline_clone(l);
@@ -92,10 +92,10 @@ int test_stroke1()
 	                  s, -c,  -(350+x1)*s+(350+y1)*c+350};
 	gfxline_transform(l2, &m);
 	gfxpoly_t*p2 = gfxpoly_from_stroke(l2, width, gfx_capRound, gfx_joinRound, 500, 0.05);
-	assert(gfxpoly_check(p2));
+	assert(gfxpoly_check(p2, 1));
 
 	gfxpoly_t*p3 = gfxpoly_intersect(p1, p2);
-	assert(gfxpoly_check(p3));
+	assert(gfxpoly_check(p3, 1));
 	
 	//gfxpoly_t*p4 = gfxpoly_from_fill(f, 0.05);
 	//gfxpoly_t*p5 = gfxpoly_intersect(p1, p4);
diff --git a/lib/gfxpoly/wind.c b/lib/gfxpoly/wind.c
index db92905..e7cf95d 100644
--- a/lib/gfxpoly/wind.c
+++ b/lib/gfxpoly/wind.c
@@ -1,6 +1,6 @@
-#include "wind.h"
+#include "poly.h"
 
-fillstyle_t fillstyle_default;
+edgestyle_t edgestyle_default;
 
 windstate_t windstate_nonfilled = {
     is_filled: 0,
@@ -13,17 +13,18 @@ windstate_t evenodd_start(windcontext_t*context)
 {
     return windstate_nonfilled;
 }
-windstate_t evenodd_add(windcontext_t*context, windstate_t left, fillstyle_t*edge, segment_dir_t dir, int master)
+windstate_t evenodd_add(windcontext_t*context, windstate_t left, edgestyle_t*edge, segment_dir_t dir, int master)
 {
+    assert(edge);
     left.is_filled ^= 1;
     return left;
 }
-fillstyle_t* evenodd_diff(windstate_t*left, windstate_t*right)
+edgestyle_t* evenodd_diff(windstate_t*left, windstate_t*right)
 {
     if(left->is_filled==right->is_filled)
         return 0;
     else
-        return &fillstyle_default;
+        return &edgestyle_default;
 }
 
 windrule_t windrule_evenodd = {
@@ -34,29 +35,33 @@ windrule_t windrule_evenodd = {
 
 // -------------------- circular ----------------------
 
+edgestyle_t edgestyle_down;
+edgestyle_t edgestyle_up;
+
 windstate_t circular_start(windcontext_t*context)
 {
     return windstate_nonfilled;
 }
 
-windstate_t circular_add(windcontext_t*context, windstate_t left, fillstyle_t*edge, segment_dir_t dir, int master)
+windstate_t circular_add(windcontext_t*context, windstate_t left, edgestyle_t*edge, segment_dir_t dir, int master)
 {
+    assert(edge);
     /* which one is + and which one - doesn't actually make any difference */
     if(dir == DIR_DOWN)
-        left.wind_nr++;
+	left.wind_nr++;
     else
-        left.wind_nr--;
+	left.wind_nr--;
 
     left.is_filled = left.wind_nr != 0;
     return left;
 }
 
-fillstyle_t* circular_diff(windstate_t*left, windstate_t*right)
+edgestyle_t* circular_diff(windstate_t*left, windstate_t*right)
 {
     if(left->is_filled==right->is_filled)
         return 0;
     else
-        return &fillstyle_default;
+        return &edgestyle_default;
 }
 
 windrule_t windrule_circular = {
@@ -72,7 +77,7 @@ windstate_t intersect_start(windcontext_t*context)
     return windstate_nonfilled;
 }
 
-windstate_t intersect_add(windcontext_t*context, windstate_t left, fillstyle_t*edge, segment_dir_t dir, int master)
+windstate_t intersect_add(windcontext_t*context, windstate_t left, edgestyle_t*edge, segment_dir_t dir, int master)
 {
     assert(master < context->num_polygons);
 
@@ -81,12 +86,12 @@ windstate_t intersect_add(windcontext_t*context, windstate_t left, fillstyle_t*e
     return left;
 }
 
-fillstyle_t* intersect_diff(windstate_t*left, windstate_t*right)
+edgestyle_t* intersect_diff(windstate_t*left, windstate_t*right)
 {
     if(left->is_filled==right->is_filled)
         return 0;
     else
-        return &fillstyle_default;
+        return &edgestyle_default;
 }
 
 windrule_t windrule_intersect = {
@@ -102,7 +107,7 @@ windstate_t union_start(windcontext_t*context)
     return windstate_nonfilled;
 }
 
-windstate_t union_add(windcontext_t*context, windstate_t left, fillstyle_t*edge, segment_dir_t dir, int master)
+windstate_t union_add(windcontext_t*context, windstate_t left, edgestyle_t*edge, segment_dir_t dir, int master)
 {
     assert(master<sizeof(left.wind_nr)*8); //up to 32/64 polygons max
     left.wind_nr ^= 1<<master;
@@ -110,12 +115,12 @@ windstate_t union_add(windcontext_t*context, windstate_t left, fillstyle_t*edge,
     return left;
 }
 
-fillstyle_t* union_diff(windstate_t*left, windstate_t*right)
+edgestyle_t* union_diff(windstate_t*left, windstate_t*right)
 {
     if(left->is_filled==right->is_filled)
         return 0;
     else
-        return &fillstyle_default;
+        return &edgestyle_default;
 }
 
 windrule_t windrule_union = {
diff --git a/lib/gfxpoly/wind.h b/lib/gfxpoly/wind.h
index 1dae74e..374b974 100644
--- a/lib/gfxpoly/wind.h
+++ b/lib/gfxpoly/wind.h
@@ -1,7 +1,35 @@
 #ifndef __wind_h__
 #define __wind_h__
 
-#include "poly.h"
+/* Every segment has an original direction, which is the direction
+   the segment had in the input data.
+   as our scanline moves from minimum y to maximum y, "DOWN" means
+   the the (original) segment's y2 is larger than its y1 */
+typedef enum {DIR_UP, DIR_DOWN, DIR_UNKNOWN} segment_dir_t;
+
+typedef struct _edgestyle {
+    void*internal;
+} edgestyle_t;
+
+extern edgestyle_t edgestyle_default;
+
+typedef struct _windstate
+{
+    char is_filled;
+    int wind_nr;
+} windstate_t;
+
+typedef struct _windcontext
+{
+    int num_polygons;
+} windcontext_t;
+
+typedef struct _windrule
+{
+    windstate_t (*start)(windcontext_t* num_polygons);
+    windstate_t (*add)(windcontext_t*context, windstate_t left, edgestyle_t*edge, segment_dir_t dir, int polygon_nr);
+    edgestyle_t* (*diff)(windstate_t*left, windstate_t*right);
+} windrule_t;
 
 extern windrule_t windrule_evenodd;
 extern windrule_t windrule_circular;
diff --git a/lib/gfxpoly/xrow.h b/lib/gfxpoly/xrow.h
index e172920..ee0be13 100644
--- a/lib/gfxpoly/xrow.h
+++ b/lib/gfxpoly/xrow.h
@@ -33,6 +33,17 @@ xrow_t* xrow_new();
    line (from right to left, using the below fillstyle).
 */
 
+/* Another approach: since we really only need to know the below *or* above fillstyles in order to
+   determine whether a horizontal line is still needed (if its edgestyle doesn't change the windstate,
+   it's not needed), we can also process horizontal lines after the start events: walk the temporary
+   end segment list and the active list interleaved for each horizontal line, insert horizontal fragments
+   whenever they seem to modify the fillstyle (e.g. apply them with dir=UP).
+   This means that "very horizontal" segments ending in a scanline that encounter hot pixels
+   on their way (and thus don't receive "their" endpoint) need to store a horizontal event. Same for
+   general segments that pass/intersect multiple hotpixels in a scanline.
+*/
+
+
 void xrow_add(xrow_t*xrow, int32_t x);
 
 void xrow_sort(xrow_t*xrow);