git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for cases where a clip/shape intersection is zero
[swftools.git]
/
lib
/
devices
/
polyops.c
diff --git
a/lib/devices/polyops.c
b/lib/devices/polyops.c
index
b5bb1d3
..
e193589
100644
(file)
--- a/
lib/devices/polyops.c
+++ b/
lib/devices/polyops.c
@@
-45,9
+45,6
@@
typedef struct _internal {
gfxdevice_t*out;
clip_t*clip;
gfxpoly_t*polyunion;
gfxdevice_t*out;
clip_t*clip;
gfxpoly_t*polyunion;
-
- int good_polygons;
- int bad_polygons;
} internal_t;
static int verbose = 0;
} internal_t;
static int verbose = 0;
@@
-93,11
+90,6
@@
void polyops_startclip(struct _gfxdevice*dev, gfxline_t*line)
gfxpoly_t* oldclip = i->clip?i->clip->poly:0;
gfxpoly_t* poly = gfxpoly_fillToPoly(line);
gfxpoly_t* oldclip = i->clip?i->clip->poly:0;
gfxpoly_t* poly = gfxpoly_fillToPoly(line);
- if(poly)
- i->good_polygons++;
- else
- i->bad_polygons++;
-
gfxpoly_t* currentclip = 0;
int type = 0;
gfxpoly_t* currentclip = 0;
int type = 0;
@@
-119,13
+111,11
@@
void polyops_startclip(struct _gfxdevice*dev, gfxline_t*line)
} else if(poly && oldclip) {
gfxpoly_t*intersection = gfxpoly_intersect(poly, oldclip);
if(intersection) {
} else if(poly && oldclip) {
gfxpoly_t*intersection = gfxpoly_intersect(poly, oldclip);
if(intersection) {
- i->good_polygons++;
// this case is what usually happens
gfxpoly_free(poly);poly=0;
currentclip = intersection;
type = 0;
} else {
// this case is what usually happens
gfxpoly_free(poly);poly=0;
currentclip = intersection;
type = 0;
} else {
- i->bad_polygons++;
gfxline_t*oldclipline = gfxpoly_to_gfxline(oldclip);
i->out->startclip(i->out, oldclipline);
currentclip = poly;
gfxline_t*oldclipline = gfxpoly_to_gfxline(oldclip);
i->out->startclip(i->out, oldclipline);
currentclip = poly;
@@
-186,12
+176,6
@@
static gfxline_t* handle_poly(gfxdevice_t*dev, gfxpoly_t*poly, char*ok)
gfxpoly_free(old);
}
}
gfxpoly_free(old);
}
}
-
- if(poly)
- i->good_polygons++;
- else
- i->bad_polygons++;
-
addtounion(dev, poly);
gfxline_t*gfxline = 0;
if(poly) {
addtounion(dev, poly);
gfxline_t*gfxline = 0;
if(poly) {
@@
-351,13
+335,8
@@
gfxresult_t* polyops_finish(struct _gfxdevice*dev)
dbg("polyops_finish");
internal_t*i = (internal_t*)dev->internal;
dbg("polyops_finish");
internal_t*i = (internal_t*)dev->internal;
-
if(i->polyunion) {
gfxpoly_free(i->polyunion);i->polyunion=0;
if(i->polyunion) {
gfxpoly_free(i->polyunion);i->polyunion=0;
- } else {
- if(i->bad_polygons) {
- msg("<notice> --flatten success rate: %.1f%% (%d failed polygons)", i->good_polygons*100.0 / (i->good_polygons + i->bad_polygons), i->bad_polygons);
- }
}
if(i->out) {
return i->out->finish(i->out);
}
if(i->out) {
return i->out->finish(i->out);