more horizontal refactoring
[swftools.git] / lib / gfxtools.c
index f6853da..7160033 100644 (file)
@@ -658,8 +658,8 @@ gfxbbox_t gfxbbox_expand_to_point(gfxbbox_t box, gfxcoord_t x, gfxcoord_t y)
 
 gfxbbox_t gfxbbox_expand_to_bbox(gfxbbox_t box, gfxbbox_t box2)
 {
-    gfxbbox_expand_to_point(box, box2.xmin, box2.ymin);
-    gfxbbox_expand_to_point(box, box2.xmax, box2.ymax);
+    box = gfxbbox_expand_to_point(box, box2.xmin, box2.ymin);
+    box = gfxbbox_expand_to_point(box, box2.xmax, box2.ymax);
     return box;
 }
 
@@ -1054,6 +1054,7 @@ gfxline_t* gfxline_restitch(gfxline_t*line)
                gfxpoint_t xy = {line->x, line->y};
                dict_put(rev, &xy, prev);
                line->next = 0;
+               prev=0;
            }
        }
        line = next;