trivial fixes

[swftools.git] / lib / gfxpoly / poly.c

diff --git a/lib/gfxpoly/poly.c b/lib/gfxpoly/poly.c
index 01781cc..71a743b 100644 (file)
--- a/lib/gfxpoly/poly.c
+++ b/lib/gfxpoly/poly.c
@@ -133,6 +133,8 @@ typedef struct _horizontal {
     edgestyle_t*fs;
     segment_dir_t dir;
     int polygon_nr;
     edgestyle_t*fs;
     segment_dir_t dir;
     int polygon_nr;

+    int xpos;
+    int pos;

 } horizontal_t;
 
 typedef struct _horizdata {
 } horizontal_t;
 
 typedef struct _horizdata {

@@ -184,7 +186,6 @@ int gfxpoly_size(gfxpoly_t*poly)
 
 char gfxpoly_check(gfxpoly_t*poly, char updown)
 {
 
 char gfxpoly_check(gfxpoly_t*poly, char updown)
 {

-    current_polygon = poly;

     dict_t*d1 = dict_new2(&point_type);
     dict_t*d2 = dict_new2(&point_type);
     int s,t;
     dict_t*d1 = dict_new2(&point_type);
     dict_t*d2 = dict_new2(&point_type);
     int s,t;

@@ -234,18 +235,35 @@ char gfxpoly_check(gfxpoly_t*poly, char updown)
            return 0;
         }
     }
            return 0;
         }
     }

-    dict_destroy(d1);

     if(updown) {
        DICT_ITERATE_ITEMS(d2, point_t*, p2, void*, c2) {
            int count = (ptroff_t)c2;
     if(updown) {
        DICT_ITERATE_ITEMS(d2, point_t*, p2, void*, c2) {
            int count = (ptroff_t)c2;

+           assert(dict_contains(d1, p2));
+           int ocount = (ptroff_t)dict_lookup(d1, p2);

            if(count!=0) {
            if(count!=0) {

-               if(count>0) fprintf(stderr, "Error: Point (%d,%d) has %d more incoming than outgoing segments\n", p2->x, p2->y, count);
-               if(count<0) fprintf(stderr, "Error: Point (%d,%d) has %d more outgoing than incoming segments\n", p2->x, p2->y, -count);
+               if(count>0) fprintf(stderr, "Error: Point (%.2f,%.2f) has %d more incoming than outgoing segments (%d incoming, %d outgoing)\n", p2->x * poly->gridsize, p2->y * poly->gridsize, count, (ocount+count)/2, (ocount-count)/2);
+               if(count<0) fprintf(stderr, "Error: Point (%.2f,%.2f) has %d more outgoing than incoming segments (%d incoming, %d outgoing)\n", p2->x * poly->gridsize, p2->y * poly->gridsize, -count, (ocount+count)/2, (ocount-count)/2);
+               gfxpolystroke_t*stroke = poly->strokes;
+               for(;stroke;stroke=stroke->next) {
+                   for(s=0;s<stroke->num_points-1;s++) {
+                       point_t a = stroke->points[s];
+                       point_t b = stroke->points[s+1];
+                       if(a.x == p2->x && a.y == p2->y ||
+                          b.x == p2->x && b.y == p2->y) {
+                           fprintf(stderr, "%.2f,%.2f -> %.2f,%.2f\n", 
+                                   a.x * poly->gridsize, 
+                                   a.y * poly->gridsize, 
+                                   b.x * poly->gridsize, 
+                                   b.y * poly->gridsize);
+                       }
+                   }
+               }

                dict_destroy(d2);
                return 0;
            }
        }
     }
                dict_destroy(d2);
                return 0;
            }
        }
     }

+    dict_destroy(d1);

     dict_destroy(d2);
     return 1;
 }
     dict_destroy(d2);
     return 1;
 }

@@ -307,7 +325,7 @@ void gfxpoly_save_arrows(gfxpoly_t*poly, const char*filename)
     double g = poly->gridsize;
     gfxpolystroke_t*stroke = poly->strokes;
     for(;stroke;stroke=stroke->next) {
     double g = poly->gridsize;
     gfxpolystroke_t*stroke = poly->strokes;
     for(;stroke;stroke=stroke->next) {

-       fprintf(fi, "%g setgray\n", 0);
+       fprintf(fi, "0 setgray\n");

 
        int s = stroke->dir==DIR_UP?stroke->num_points-1:0;
        int end = stroke->dir==DIR_UP?-1:stroke->num_points;
 
        int s = stroke->dir==DIR_UP?stroke->num_points-1:0;
        int end = stroke->dir==DIR_UP?-1:stroke->num_points;

@@ -382,21 +400,28 @@ static void segment_dump(segment_t*s)
 
 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)
 {
 
 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)
 {

+    static int segment_count=0;
+    s->nr = segment_count++;

     s->dir = dir;
     if(y1!=y2) {
        assert(y1<y2);
     } else {
         /* We need to make sure horizontal segments always go from left to right.
           "up/down" for horizontal segments is handled by "rotating"
     s->dir = dir;
     if(y1!=y2) {
        assert(y1<y2);
     } else {
         /* We need to make sure horizontal segments always go from left to right.
           "up/down" for horizontal segments is handled by "rotating"

-           them 90° anticlockwise in screen coordinates (tilt your head to
-           the right).
+           them 90° counterclockwise in screen coordinates (tilt your head to
+           the right). In other words, the "normal" direction (what's positive dy for
+          vertical segments) is positive dx for horizontal segments ("down" is right).

         */
         */

-        s->dir = DIR_UP;

         if(x1>x2) {
         if(x1>x2) {

-            s->dir = DIR_DOWN;
+            s->dir = DIR_INVERT(s->dir);

             int32_t x = x1;x1=x2;x2=x;
             int32_t y = y1;y1=y2;y2=y;
         }
             int32_t x = x1;x1=x2;x2=x;
             int32_t y = y1;y1=y2;y2=y;
         }

+#ifdef DEBUG
+       fprintf(stderr, "Scheduling horizontal segment [%d] (%.2f,%.2f) -> (%.2f,%.2f) %s\n",
+               segment_count,
+               x1 * 0.05, y1 * 0.05, x2 * 0.05, y2 * 0.05, s->dir==DIR_UP?"up":"down");
+#endif

     }
     s->a.x = x1;
     s->a.y = y1;
     }
     s->a.x = x1;
     s->a.y = y1;

@@ -411,8 +436,6 @@ static void segment_init(segment_t*s, int32_t x1, int32_t y1, int32_t x2, int32_
 
     s->pos = s->a;
     s->polygon_nr = polygon_nr;
 
     s->pos = s->a;
     s->polygon_nr = polygon_nr;

-    static int segment_count=0;
-    s->nr = segment_count++;

 
 #ifdef CHECKS
     /* notice: on some systems (with some compilers), for the line 
 
 #ifdef CHECKS
     /* notice: on some systems (with some compilers), for the line 

@@ -461,7 +484,7 @@ static void segment_destroy(segment_t*s)
     free(s);
 }
 
     free(s);
 }
 

-static void advance_stroke(queue_t*queue, hqueue_t*hqueue, gfxpolystroke_t*stroke, int polygon_nr, int pos)
+static void advance_stroke(queue_t*queue, hqueue_t*hqueue, gfxpolystroke_t*stroke, int polygon_nr, int pos, double gridsize)

 {
     if(!stroke) 
        return;
 {
     if(!stroke) 
        return;

@@ -478,8 +501,9 @@ static void advance_stroke(queue_t*queue, hqueue_t*hqueue, gfxpolystroke_t*strok
 #ifdef DEBUG
        /*if(l->tmp)
            s->nr = l->tmp;*/
 #ifdef DEBUG
        /*if(l->tmp)
            s->nr = l->tmp;*/

-       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,
+       fprintf(stderr, "[%d] (%.2f,%.2f) -> (%.2f,%.2f) %s (stroke %p, %d more to come)\n",
+               s->nr, s->a.x * gridsize, s->a.y * gridsize, 
+               s->b.x * gridsize, s->b.y * gridsize,

                s->dir==DIR_UP?"up":"down", stroke, stroke->num_points - 1 - pos);
 #endif
        event_t* e = event_new();
                s->dir==DIR_UP?"up":"down", stroke, stroke->num_points - 1 - pos);
 #endif
        event_t* e = event_new();

@@ -514,7 +538,7 @@ static void gfxpoly_enqueue(gfxpoly_t*p, queue_t*queue, hqueue_t*hqueue, int pol
            assert(stroke->points[s].y <= stroke->points[s+1].y);
        }
 #endif
            assert(stroke->points[s].y <= stroke->points[s+1].y);
        }
 #endif

-       advance_stroke(queue, hqueue, stroke, polygon_nr, 0);
+       advance_stroke(queue, hqueue, stroke, polygon_nr, 0, p->gridsize);

     }
 }
 
     }
 }
 

@@ -798,16 +822,21 @@ static void insert_point_into_segment(status_t*status, segment_t*s, point_t p)
     if(s->pos.y != p.y) {
        /* non horizontal line- copy to output */
        if(s->fs_out) {
     if(s->pos.y != p.y) {
        /* non horizontal line- copy to output */
        if(s->fs_out) {

+           segment_dir_t dir = s->wind.is_filled?DIR_DOWN:DIR_UP;

 #ifdef DEBUG
 #ifdef DEBUG

-           fprintf(stderr, "[%d] receives next point (%d,%d)->(%d,%d) (drawing)\n", s->nr,
-                   s->pos.x, s->pos.y, p.x, p.y);
+           fprintf(stderr, "[%d] receives next point (%.2f,%.2f)->(%.2f,%.2f) (drawing (%s))\n", s->nr,
+                   s->pos.x * status->gridsize, s->pos.y * status->gridsize, 
+                   p.x * status->gridsize, p.y * status->gridsize,
+                   dir==DIR_UP?"up":"down"
+                   );

 #endif
 #endif

-           segment_dir_t dir = s->wind.is_filled?DIR_DOWN:DIR_UP;

            assert(s->pos.y != p.y);
            append_stroke(status, s->pos, p, dir, s->fs_out);
        } else {
 #ifdef DEBUG
            assert(s->pos.y != p.y);
            append_stroke(status, s->pos, p, dir, s->fs_out);
        } else {
 #ifdef DEBUG

-           fprintf(stderr, "[%d] receives next point (%d,%d) (omitting)\n", s->nr, p.x, p.y);
+           fprintf(stderr, "[%d] receives next point (%.2f,%.2f) (omitting)\n", s->nr, 
+                   p.x * status->gridsize, 
+                   p.y * status->gridsize);

 #endif
        }
     } else {
 #endif
        }
     } else {

@@ -984,6 +1013,9 @@ static void add_points_to_ending_segments(status_t*status, int32_t y)
                 start = status->xrow->num-1;
                 end = dir = -1;
             }
                 start = status->xrow->num-1;
                 end = dir = -1;
             }

+#ifdef CHECKS
+           char ok = 0;
+#endif

             for(t=start;t!=end;t+=dir) {
                 box_t box = box_new(status->xrow->x[t], y);
                 double d0 = LINE_EQ(box.left1, seg);
             for(t=start;t!=end;t+=dir) {
                 box_t box = box_new(status->xrow->x[t], y);
                 double d0 = LINE_EQ(box.left1, seg);

@@ -993,14 +1025,17 @@ static void add_points_to_ending_segments(status_t*status, int32_t y)
                 if(!(d0>=0 && d1>=0 && d2>=0 && d3>0 ||
                      d0<=0 && d1<=0 && d2<=0 && d3<0)) {
                     insert_point_into_segment(status, seg, box.right2);
                 if(!(d0>=0 && d1>=0 && d2>=0 && d3>0 ||
                      d0<=0 && d1<=0 && d2<=0 && d3<0)) {
                     insert_point_into_segment(status, seg, box.right2);

-                    break;
+                    //break;
+#ifdef CHECKS
+                   ok = 1;
+#endif

                 }
             }
 
 #ifdef CHECKS
             /* we *need* to find a point to insert. the segment's own end point
                is in that list, for Pete's sake. */
                 }
             }
 
 #ifdef CHECKS
             /* we *need* to find a point to insert. the segment's own end point
                is in that list, for Pete's sake. */

-            assert(t!=end);
+            assert(ok);

 #endif
         }
         // now that this is done, too, we can also finally free this segment
 #endif
         }
         // now that this is done, too, we can also finally free this segment

@@ -1087,8 +1122,9 @@ static void intersect_with_horizontal(status_t*status, segment_t*h)
     segment_t* left = actlist_find(status->actlist, h->a, h->a);
     segment_t* right = actlist_find(status->actlist, h->b, h->b);
 
     segment_t* left = actlist_find(status->actlist, h->a, h->a);
     segment_t* right = actlist_find(status->actlist, h->b, h->b);
 

-    /* not strictly necessary, also done by the event */
+    /* h->a.x is not strictly necessary, as it's also done by the event */

     xrow_add(status->xrow, h->a.x);
     xrow_add(status->xrow, h->a.x);

+    xrow_add(status->xrow, h->b.x);

 
     if(!right) {
         assert(!left);
 
     if(!right) {
         assert(!left);

@@ -1104,7 +1140,6 @@ static void intersect_with_horizontal(status_t*status, segment_t*h)
         assert(s);
         int32_t x = XPOS_INT(s, status->y);
        point_t p = {x, status->y};
         assert(s);
         int32_t x = XPOS_INT(s, status->y);
        point_t p = {x, status->y};

-       store_horizontal(status, o, p, h->fs, h->dir, h->polygon_nr);

 #ifdef DEBUG
         fprintf(stderr, "...intersecting with [%d] (%.2f,%.2f) -> (%.2f,%.2f) at (%.2f,%.2f)\n", 
                s->nr,
 #ifdef DEBUG
         fprintf(stderr, "...intersecting with [%d] (%.2f,%.2f) -> (%.2f,%.2f) at (%.2f,%.2f)\n", 
                s->nr,

@@ -1144,68 +1179,187 @@ void horiz_destroy(horizdata_t*horiz)
     horiz->data = 0;
 }
 
     horiz->data = 0;
 }
 

-static int compare_horizontals(const void *_h1, const void *_h2)
+static windstate_t get_horizontal_first_windstate(status_t*status, int x1, int x2)

 {
 {

-    horizontal_t*h1 = (horizontal_t*)_h1;
-    horizontal_t*h2 = (horizontal_t*)_h2;
-    return h1->x1 - h2->x1;
+    point_t p1 = {x1,status->y};
+    point_t p2 = {x2,status->y};
+    segment_t*left = actlist_find(status->actlist, p1, p2);
+
+    segment_t*a = actlist_right(status->actlist, left);
+    while(a) {
+       if(a->pos.y == status->y) {
+           /* we need to iterate through all segments that received a point in this
+              scanline, as actlist_find above will miss (positively sloped) segments 
+              that are to the right of (x1,y) only as long as we don't take the 
+              hotpixel re-routing into account 
+               TODO: this is inefficient, we should probably be iterating through the
+              hotpixels on this scanline.
+            */
+           if(a->pos.x == x1)
+               left = a;
+           if(a->pos.x > x1)
+               break;
+       }
+       a = a->right;
+    }
+
+    assert(!left || left->fs_out_ok);
+#ifdef DEBUG
+    fprintf(stderr, "  fragment %.2f..%.2f\n", 
+           x1 * status->gridsize,
+           x2 * status->gridsize);
+    if(left) {
+       fprintf(stderr, "    segment [%d] (%.2f,%.2f -> %.2f,%2f, at %.2f,%.2f) is to the left\n", 
+               SEGNR(left), 
+               left->a.x * status->gridsize,
+               left->a.y * status->gridsize,
+               left->b.x * status->gridsize,
+               left->b.y * status->gridsize,
+               left->pos.x * status->gridsize,
+               left->pos.y * status->gridsize
+               );
+       /* this segment might be a distance away from the left point
+          of the horizontal line if the horizontal line belongs to a stroke
+          with segments that just ended (so this horizontal line appears to
+          be "floating in space" from our current point of view)
+       assert(left->pos.y == h->y && left->pos.x == h->x1);
+       */
+    }
+#endif
+    return left?left->wind:status->windrule->start(status->context);

 }
 
 }
 

-static void process_horizontals(status_t*status)
+static windstate_t process_horizontal_fragment(status_t*status, horizontal_t*h, int x1, int x2, windstate_t below)
+{
+    windstate_t above = status->windrule->add(status->context, below, h->fs, h->dir, h->polygon_nr);
+    edgestyle_t*fs = status->windrule->diff(&above, &below);
+       
+    segment_dir_t dir = above.is_filled?DIR_DOWN:DIR_UP;
+    point_t p1 = {x1,h->y};
+    point_t p2 = {x2,h->y};
+
+    if(fs) {
+       //append_stroke(status, p1, p2, DIR_INVERT(h->dir), fs);
+       append_stroke(status, p1, p2, dir, fs);
+    }
+#ifdef DEBUG
+    fprintf(stderr, "    ...%s (below: (wind_nr=%d, filled=%d), above: (wind_nr=%d, filled=%d) %s %d-%d\n",
+           fs?"storing":"ignoring",
+           below.wind_nr, below.is_filled,
+           above.wind_nr, above.is_filled, 
+           dir==DIR_UP?"up":"down", x1, x2);
+#endif
+    return above;
+}
+
+typedef enum {hevent_hotpixel,hevent_end,hevent_start} horizontal_event_type_t;
+typedef struct _hevent {
+    int32_t x;
+    horizontal_t*h;
+    horizontal_event_type_t type;
+} hevent_t;
+
+typedef struct _hevents {
+    hevent_t*events;
+    int num;
+} hevents_t;
+
+static int compare_hevents(const void *_e1, const void *_e2)
+{
+    hevent_t*e1 = (hevent_t*)_e1;
+    hevent_t*e2 = (hevent_t*)_e2;
+    int diff = e1->x - e2->x;
+    if(diff) return diff;
+    return e1->type - e2->type; //schedule hotpixel before hend
+}
+
+static hevents_t hevents_fill(status_t*status)

 {
     horizdata_t*horiz = &status->horiz;
 {
     horizdata_t*horiz = &status->horiz;

-    qsort(horiz->data, horiz->num, sizeof(horizontal_t), compare_horizontals);
+    xrow_t*xrow = status->xrow;
+
+    hevents_t e;
+    e.events = malloc(sizeof(hevent_t)*(horiz->num*2 + xrow->num));
+    e.num = 0;
+

     int t;
     for(t=0;t<horiz->num;t++) {
     int t;
     for(t=0;t<horiz->num;t++) {

-       horizontal_t*h = &horiz->data[t];
-#ifdef DEBUG
-       fprintf(stderr, "horizontal (y=%.2f): %.2f -> %.2f dir=%s fs=%p\n", 
-               h->y * status->gridsize,
-               h->x1 * status->gridsize,
-               h->x2 * status->gridsize,
-               h->dir==DIR_UP?"up":"down", h->fs);
-#endif
-       assert(h->y == status->y);
-       assert(xrow_contains(status->xrow, h->x1));
-       assert(xrow_contains(status->xrow, h->x2));
-   
-       point_t p1 = {h->x1,h->y};
-       point_t p2 = {h->x2,h->y};
-       segment_t* left = actlist_find(status->actlist, p1, p2);
-       assert(!left || left->fs_out_ok);
-#ifdef DEBUG
-       if(left) {
-           fprintf(stderr, "  segment [%d] (%.2f,%.2f -> %.2f,%2f, at %.2f,%.2f) is to the left\n", 
-                   SEGNR(left), 
-                   left->a.x * status->gridsize,
-                   left->a.y * status->gridsize,
-                   left->b.x * status->gridsize,
-                   left->b.y * status->gridsize,
-                   left->pos.x * status->gridsize,
-                   left->pos.y * status->gridsize
-                   );
-           /* this segment might be a distance away from the left point
-              of the horizontal line if the horizontal line belongs to a stroke
-              with segments that just ended (so this horizontal line appears to
-              be "floating in space" from our current point of view)
-           assert(left->pos.y == h->y && left->pos.x == h->x1);
-           */
-       }
-#endif
-        windstate_t below = left?left->wind:status->windrule->start(status->context);
-        windstate_t above = status->windrule->add(status->context, below, h->fs, DIR_INVERT(h->dir), h->polygon_nr);
-        edgestyle_t*fs = status->windrule->diff(&above, &below);
-       if(fs) {
-#ifdef DEBUG
-           fprintf(stderr, "  ...storing\n");
-#endif
-           append_stroke(status, p1, p2, h->dir, fs);
-       } else {
+       assert(horiz->data[t].x1 != horiz->data[t].x2);
+       e.events[e.num].x = horiz->data[t].x1;
+       e.events[e.num].h = &horiz->data[t];
+       e.events[e.num].type = hevent_start;
+       e.num++;
+       e.events[e.num].x = horiz->data[t].x2;
+       e.events[e.num].h = &horiz->data[t];
+       e.events[e.num].type = hevent_end;
+       e.num++;
+    }
+    for(t=0;t<xrow->num;t++) {
+       e.events[e.num].x = status->xrow->x[t];
+       e.events[e.num].h = 0;
+       e.events[e.num].type = hevent_hotpixel;
+       e.num++;
+    }
+    qsort(e.events, e.num, sizeof(hevent_t), compare_hevents);
+    return e;
+
+}
+
+static void process_horizontals(status_t*status)
+{
+    horizdata_t*horiz = &status->horiz;
+
+    if(!horiz->num)
+       return;
+
+    hevents_t events = hevents_fill(status);
+    int num_open = 0;
+    horizontal_t**open = malloc(sizeof(horizontal_t*)*horiz->num);
+
+    int s,t;
+    for(t=0;t<events.num;t++) {
+       hevent_t*e = &events.events[t];
+       switch(e->type) {
+           case hevent_start:
+               e->h->pos = num_open;
+               open[num_open++] = e->h;

 #ifdef DEBUG
 #ifdef DEBUG

-           fprintf(stderr, "  ...ignoring\n");
-#endif
+               fprintf(stderr, "horizontal (y=%.2f): %.2f -> %.2f dir=%s fs=%p\n", 
+                       e->h->y * status->gridsize,
+                       e->h->x1 * status->gridsize,
+                       e->h->x2 * status->gridsize,
+                       e->h->dir==DIR_UP?"up":"down", e->h->fs);
+#endif
+               assert(e->h->y == status->y);
+               assert(xrow_contains(status->xrow, e->h->x1));
+               assert(xrow_contains(status->xrow, e->h->x2));
+           break;
+           case hevent_end:
+               num_open--;
+               if(num_open) {
+                   open[num_open]->pos = e->h->pos;
+                   open[e->h->pos] = open[num_open];
+               }
+           break;
+           case hevent_hotpixel:
+               {
+                   windstate_t below;
+                   for(s=0;s<num_open;s++) {
+                       int x1 = open[s]->xpos;
+                       int x2 = e->x;
+                       assert(status->y == open[s]->y);
+                       if(!s)
+                           below = get_horizontal_first_windstate(status, x1, x2);
+                       open[s]->xpos = e->x;
+                       assert(x1 < x2);
+                       below = process_horizontal_fragment(status, open[s], x1, x2, below);
+                   }
+               }
+           break;

        }
     }
        }
     }

+    free(open);
+    free(events.events);

 }
 
 static void store_horizontal(status_t*status, point_t p1, point_t p2, edgestyle_t*fs, segment_dir_t dir, int polygon_nr)
 }
 
 static void store_horizontal(status_t*status, point_t p1, point_t p2, edgestyle_t*fs, segment_dir_t dir, int polygon_nr)

@@ -1221,6 +1375,7 @@ static void store_horizontal(status_t*status, point_t p1, point_t p2, edgestyle_
        p2 = p_1;
     }
 
        p2 = p_1;
     }
 

+    /* TODO: convert this into a linked list */

     if(status->horiz.size == status->horiz.num) {
        if(!status->horiz.size)
            status->horiz.size = 16;
     if(status->horiz.size == status->horiz.num) {
        if(!status->horiz.size)
            status->horiz.size = 16;

@@ -1229,6 +1384,7 @@ static void store_horizontal(status_t*status, point_t p1, point_t p2, edgestyle_
     }
     horizontal_t*h = &status->horiz.data[status->horiz.num++];
     h->y = p1.y;
     }
     horizontal_t*h = &status->horiz.data[status->horiz.num++];
     h->y = p1.y;

+    h->xpos = p1.x;

     h->x1 = p1.x;
     h->x2 = p2.x;
     h->fs = fs;
     h->x1 = p1.x;
     h->x2 = p2.x;
     h->fs = fs;

@@ -1247,7 +1403,8 @@ static void event_apply(status_t*status, event_t*e)
         case EVENT_HORIZONTAL: {
             segment_t*s = e->s1;
             intersect_with_horizontal(status, s);
         case EVENT_HORIZONTAL: {
             segment_t*s = e->s1;
             intersect_with_horizontal(status, s);

-           advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos);
+           store_horizontal(status, s->a, s->b, s->fs, s->dir, s->polygon_nr);
+           advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos, status->gridsize);

             segment_destroy(s);e->s1=0;
             break;
         }
             segment_destroy(s);e->s1=0;
             break;
         }

@@ -1269,7 +1426,7 @@ static void event_apply(status_t*status, event_t*e)
            /* schedule segment for xrow handling */
             s->left = 0; s->right = status->ending_segments;
             status->ending_segments = s;
            /* schedule segment for xrow handling */
             s->left = 0; s->right = status->ending_segments;
             status->ending_segments = s;

-           advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos);
+           advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos, status->gridsize);

             break;
         }
         case EVENT_START: {
             break;
         }
         case EVENT_START: {

@@ -1334,164 +1491,6 @@ static void check_status(status_t*status)
 }
 #endif
 
 }
 #endif
 

-static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*context)
-{
-    /*
-          |..|        |...........|                 |           |
-          |..|        |...........|                 |           |
-          |..+        +        +..|                 +--+     +--+
-          |...........|        |..|                    |     |
-          |...........|        |..|                    |     |
-     */
-
-#ifdef DEBUG
-    fprintf(stderr, "========================================================================\n");
-#endif
-    hqueue_t hqueue;
-    hqueue_init(&hqueue);
-    gfxpoly_enqueue(poly, 0, &hqueue, 0);
-
-    actlist_t* actlist = actlist_new();
-       
-    event_t*e = hqueue_get(&hqueue);
-    while(e) {
-        int32_t y = e->p.y;
-        int32_t x = 0;
-#ifdef DEBUG
-        fprintf(stderr, "HORIZONTALS ----------------------------------- %f\n", y);
-        actlist_dump(actlist, y-1, 1.0);
-#endif
-#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) {
-               assert(abs(wind)==1);
-               assert(x<e->p.x);
-
-                gfxpolystroke_t*stroke = rfx_calloc(sizeof(gfxpolystroke_t));
-               stroke->next = poly->strokes;
-               poly->strokes = stroke;
-
-               stroke->num_points = 2;
-               stroke->points = malloc(sizeof(point_t)*2);
-
-               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;
-                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 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;
-            switch(e->type) {
-                case EVENT_START: {
-                   assert(e->p.x == s->a.x && e->p.y == s->a.y);
-                    actlist_insert(actlist, s->a, s->b, s);
-                    event_t* e = event_new();
-                    e->type = EVENT_END;
-                    e->p = s->b;
-                    e->s1 = s;
-                    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 = 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 dir:%s\n",
-                    y, e->type==EVENT_START?"start":"end",
-                    s->nr,
-                    left?left->nr:-1,
-                    x, s->dir==DIR_UP?"up":"down");
-#endif
-
-            if(e->type == EVENT_END)
-                segment_destroy(s);
-
-           event_free(e);
-            e = hqueue_get(&hqueue);
-        } while(e && y == e->p.y);
-
-#ifdef CHECKS
-       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
-    }
-
-    actlist_destroy(actlist);
-    hqueue_destroy(&hqueue);
-}
-

 gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule, windcontext_t*context)
 {
     current_polygon = poly1;
 gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule, windcontext_t*context)
 {
     current_polygon = poly1;

@@ -1499,7 +1498,7 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule
     status_t status;
     memset(&status, 0, sizeof(status_t));
     status.gridsize = poly1->gridsize;
     status_t status;
     memset(&status, 0, sizeof(status_t));
     status.gridsize = poly1->gridsize;

-
+    

     queue_init(&status.queue);
     gfxpoly_enqueue(poly1, &status.queue, 0, /*polygon nr*/0);
     if(poly2) {
     queue_init(&status.queue);
     gfxpoly_enqueue(poly1, &status.queue, 0, /*polygon nr*/0);
     if(poly2) {

@@ -1551,12 +1550,15 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule
         memset(&range, 0, sizeof(range));
 #ifdef DEBUG
         actlist_dump(status.actlist, status.y, status.gridsize);
         memset(&range, 0, sizeof(range));
 #ifdef DEBUG
         actlist_dump(status.actlist, status.y, status.gridsize);

+       xrow_dump(status.xrow, status.gridsize);

 #endif
         add_points_to_positively_sloped_segments(&status, status.y, &range);
         add_points_to_negatively_sloped_segments(&status, status.y, &range);
         add_points_to_ending_segments(&status, status.y);
 
         recalculate_windings(&status, &range);
 #endif
         add_points_to_positively_sloped_segments(&status, status.y, &range);
         add_points_to_negatively_sloped_segments(&status, status.y, &range);
         add_points_to_ending_segments(&status, status.y);
 
         recalculate_windings(&status, &range);

+        
+       actlist_verify(status.actlist, status.y);

        process_horizontals(&status);
 #ifdef CHECKS
         check_status(&status);
        process_horizontals(&status);
 #ifdef CHECKS
         check_status(&status);

@@ -1585,9 +1587,6 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule
        stroke = stroke->next;
     }
 #endif
        stroke = stroke->next;
     }
 #endif

-
-    //add_horizontals(p, &windrule_evenodd, context); // output is always even/odd
-    //add_horizontals(p, windrule, context);

     return p;
 }
 
     return p;
 }