handle NULL (errorneous) polygons

[swftools.git] / lib / devices / polyops.c

diff --git a/lib/devices/polyops.c b/lib/devices/polyops.c
index b5bb1d3..b4c2a0b 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;
-    
-    int good_polygons;
-    int bad_polygons;
 } 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);
-    if(poly) 
-        i->good_polygons++;
-    else
-        i->bad_polygons++;
-
     gfxpoly_t* currentclip = 0;
     int type = 0;
 
@@ -105,7 +97,7 @@ void polyops_startclip(struct _gfxdevice*dev, gfxline_t*line)
        a gfxline into a gfxpoly- for polygons which are too
        complex or just degenerate, this might fail. So handle
        all the cases where polygon conversion or intersection
-       might go awry */
+       might fail */
     if(!poly && !oldclip) {
        i->out->startclip(i->out,line);
        currentclip = 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) {
-            i->good_polygons++;
            // 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;
@@ -176,7 +166,7 @@ static void addtounion(struct _gfxdevice*dev, gfxpoly_t*poly)
     }
 }
 
-static gfxline_t* handle_poly(gfxdevice_t*dev, gfxpoly_t*poly, char*ok)
+gfxline_t* handle_poly(gfxdevice_t*dev, gfxpoly_t*poly)
 {
     internal_t*i = (internal_t*)dev->internal;
     if(i->clip && i->clip->poly) {
@@ -186,19 +176,12 @@ static gfxline_t* handle_poly(gfxdevice_t*dev, gfxpoly_t*poly, char*ok)
            gfxpoly_free(old);
        }
     }
-
-    if(poly) 
-        i->good_polygons++;
-    else
-        i->bad_polygons++;
-
     addtounion(dev, poly);
     gfxline_t*gfxline = 0;
     if(poly) {
        // this is the case where everything went right
        gfxline_t*line = gfxpoly_to_gfxline(poly);
        gfxpoly_free(poly);
-        *ok = 1;
        return line;
     } else {
        if(i->clip && i->clip->poly) {
@@ -223,14 +206,12 @@ void polyops_stroke(struct _gfxdevice*dev, gfxline_t*line, gfxcoord_t width, gfx
     internal_t*i = (internal_t*)dev->internal;
 
     gfxpoly_t* poly = gfxpoly_strokeToPoly(line, width, cap_style, joint_style, miterLimit);
-    char ok = 0;
-    gfxline_t*line2 = handle_poly(dev, poly, &ok);
+    gfxline_t*line2 = handle_poly(dev, poly);
 
-    if(ok) {
-       if(i->out && line2) i->out->fill(i->out, line2, color);
+    if(line2) {
+       if(i->out) i->out->fill(i->out, line2, color);
        gfxline_free(line2);
     } else {
-        msg("<error> ..");
        if(i->out) i->out->stroke(i->out, line, width, color, cap_style, joint_style, miterLimit);
     }
 }
@@ -241,11 +222,10 @@ void polyops_fill(struct _gfxdevice*dev, gfxline_t*line, gfxcolor_t*color)
     internal_t*i = (internal_t*)dev->internal;
 
     gfxpoly_t*poly = gfxpoly_fillToPoly(line);
-    char ok = 0;
-    gfxline_t*line2 = handle_poly(dev, poly, &ok);
+    gfxline_t*line2 = handle_poly(dev, poly);
 
-    if(ok) {
-       if(i->out && line2) i->out->fill(i->out, line2, color);
+    if(line2) {
+       if(i->out) i->out->fill(i->out, line2, color);
        gfxline_free(line2);
     } else {
        if(i->out) i->out->fill(i->out, line, color);
@@ -258,11 +238,10 @@ void polyops_fillbitmap(struct _gfxdevice*dev, gfxline_t*line, gfximage_t*img, g
     internal_t*i = (internal_t*)dev->internal;
     
     gfxpoly_t*poly = gfxpoly_fillToPoly(line);
-    char ok = 0;
-    gfxline_t*line2 = handle_poly(dev, poly, &ok);
+    gfxline_t*line2 = handle_poly(dev, poly);
 
-    if(ok) {
-       if(i->out && line2) i->out->fillbitmap(i->out, line2, img, matrix, cxform);
+    if(line2) {
+       if(i->out) i->out->fillbitmap(i->out, line2, img, matrix, cxform);
        gfxline_free(line2);
     } else {
        if(i->out) i->out->fillbitmap(i->out, line, img, matrix, cxform);
@@ -275,11 +254,10 @@ void polyops_fillgradient(struct _gfxdevice*dev, gfxline_t*line, gfxgradient_t*g
     internal_t*i = (internal_t*)dev->internal;
     
     gfxpoly_t*poly = gfxpoly_fillToPoly(line);
-    char ok = 0;
-    gfxline_t*line2 = handle_poly(dev, poly, &ok);
+    gfxline_t*line2 = handle_poly(dev, poly);
 
-    if(ok) {
-       if(i->out && line2) i->out->fillgradient(i->out, line2, gradient, type, matrix);
+    if(line2) {
+       if(i->out) i->out->fillgradient(i->out, line2, gradient, type, matrix);
        gfxline_free(line2);
     } else {
        if(i->out) i->out->fillgradient(i->out, line, gradient, type, matrix);
@@ -306,9 +284,8 @@ void polyops_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr, gfxcol
        gfxbbox_t bbox = gfxline_getbbox(glyph);
        gfxpoly_t*dummybox = gfxpoly_createbox(bbox.xmin,bbox.ymin,bbox.xmax,bbox.ymax);
 
-        char ok=0;
-       gfxline_t*gfxline = handle_poly(dev, dummybox, &ok);
-       if(ok) {
+       gfxline_t*gfxline = handle_poly(dev, dummybox);
+       if(gfxline) {
            gfxbbox_t bbox2 = gfxline_getbbox(gfxline);
            double w = bbox2.xmax - bbox2.xmin;
            double h = bbox2.ymax - bbox2.ymin;
@@ -351,13 +328,8 @@ gfxresult_t* polyops_finish(struct _gfxdevice*dev)
     dbg("polyops_finish");
     internal_t*i = (internal_t*)dev->internal;
 
-
     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);