git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed build
[swftools.git]
/
lib
/
gfxtools.c
diff --git
a/lib/gfxtools.c
b/lib/gfxtools.c
index
2527675
..
7160033
100644
(file)
--- a/
lib/gfxtools.c
+++ b/
lib/gfxtools.c
@@
-656,6
+656,13
@@
gfxbbox_t gfxbbox_expand_to_point(gfxbbox_t box, gfxcoord_t x, gfxcoord_t y)
return box;
}
return box;
}
+gfxbbox_t gfxbbox_expand_to_bbox(gfxbbox_t box, gfxbbox_t box2)
+{
+ box = gfxbbox_expand_to_point(box, box2.xmin, box2.ymin);
+ box = gfxbbox_expand_to_point(box, box2.xmax, box2.ymax);
+ return box;
+}
+
void gfxbbox_intersect(gfxbbox_t*box1, gfxbbox_t*box2)
{
if(box2->xmin > box1->xmin)
void gfxbbox_intersect(gfxbbox_t*box1, gfxbbox_t*box2)
{
if(box2->xmin > box1->xmin)
@@
-1047,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;
gfxpoint_t xy = {line->x, line->y};
dict_put(rev, &xy, prev);
line->next = 0;
+ prev=0;
}
}
line = next;
}
}
line = next;