fixed a few bugs in remove_font_transforms filter

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

diff --git a/lib/devices/polyops.c b/lib/devices/polyops.c
index e6dd671..de03533 100644 (file)
--- a/lib/devices/polyops.c
+++ b/lib/devices/polyops.c
@@ -105,7 +105,11 @@ 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 go awry 
+       UPDATE: this is not needed anymore. The new gfxpoly
+       implementation is stable enough so it always returns
+       a valid result. Still, it's good practice.
+     */
     if(!poly && !oldclip) {
        i->out->startclip(i->out,line);
        currentclip = 0;
@@ -305,6 +309,9 @@ void polyops_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr, gfxcol
     if(i->clip && i->clip->poly) {
        gfxbbox_t bbox = gfxline_getbbox(glyph);
        gfxpoly_t*dummybox = gfxpoly_createbox(bbox.xmin,bbox.ymin,bbox.xmax,bbox.ymax, DEFAULT_GRID);
+       gfxline_t*dummybox2 = gfxline_from_gfxpoly(dummybox);
+       bbox = gfxline_getbbox(dummybox2);
+       gfxline_free(dummybox2);
 
         char ok=0;
        gfxline_t*gfxline = handle_poly(dev, dummybox, &ok);
@@ -312,12 +319,15 @@ void polyops_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr, gfxcol
            gfxbbox_t bbox2 = gfxline_getbbox(gfxline);
            double w = bbox2.xmax - bbox2.xmin;
            double h = bbox2.ymax - bbox2.ymin;
-           if(w < 0.001 || h < 0.001) /* character was clipped completely */ {
-           } else if(fabs((bbox.xmax - bbox.xmin) - w) > 0.05 ||
-                     fabs((bbox.ymax - bbox.ymin) - h) > 0.05) {
+           if(fabs((bbox.xmax - bbox.xmin) - w) > DEFAULT_GRID*2 ||
+              fabs((bbox.ymax - bbox.ymin) - h) > DEFAULT_GRID*2) {
                /* notable change in character size: character was clipped 
                   TODO: how to deal with diagonal cuts?
                 */
+               msg("<trace> Character %d was clipped: (%f,%f,%f,%f) -> (%f,%f,%f,%f)",
+                       glyphnr, 
+                       bbox.xmin,bbox.ymin,bbox.xmax,bbox.ymax,
+                       bbox2.xmin,bbox2.ymin,bbox2.xmax,bbox2.ymax);
                polyops_fill(dev, glyph, color);
            } else {
                if(i->out) i->out->drawchar(i->out, font, glyphnr, color, matrix);
@@ -325,6 +335,7 @@ void polyops_drawchar(struct _gfxdevice*dev, gfxfont_t*font, int glyphnr, gfxcol
        } else {
            if(i->out) i->out->drawchar(i->out, font, glyphnr, color, matrix);
        }
+       gfxline_free(gfxline);
     } else {
        if(i->out) i->out->drawchar(i->out, font, glyphnr, color, matrix);
     }
@@ -351,7 +362,6 @@ gfxresult_t* polyops_finish(struct _gfxdevice*dev)
     dbg("polyops_finish");
     internal_t*i = (internal_t*)dev->internal;
 
-
     if(i->polyunion) {
        gfxpoly_destroy(i->polyunion);i->polyunion=0;
     } else {
@@ -359,8 +369,10 @@ gfxresult_t* polyops_finish(struct _gfxdevice*dev)
             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);
+    gfxdevice_t*out = i->out;
+    free(i);memset(dev, 0, sizeof(gfxdevice_t));
+    if(out) {
+       return out->finish(out);
     } else {
        return 0;
     }