X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpdf%2FGFXOutputDev.cc;h=df8f27f6562e712a73c037b2d225c0d030d79bbe;hb=8a8b565fc2afe928ac84943079b3500ff5667ba9;hp=210f88d62662a5f3fe9cae7aff21b6fce1cc44e1;hpb=010a89e2887299503b1e8dfb08417e38ac7bc98e;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index 210f88d..df8f27f 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -1200,7 +1200,8 @@ void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doubl
     device->fill(device, clippath, &white);
 }
 
-void GFXOutputDev::processLink(Link *link, Catalog *catalog) 
+
+void GFXOutputDev::processLink(Link *link, Catalog *catalog)
 {
     double x1, y1, x2, y2, w;
     gfxline_t points[5];
@@ -1558,7 +1559,7 @@ char*GFXOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
       }
       FoFiType1C *cvt = FoFiType1C::make(fontBuf, fontLen);
       if(!cvt) return 0;
-      cvt->convertToType1(NULL, gTrue, FoFiWrite, f);
+      cvt->convertToType1(0, NULL, gTrue, FoFiWrite, f);
       //cvt->convertToCIDType0("test", f);
       //cvt->convertToType0("test", f);
       delete cvt;
@@ -2396,7 +2397,8 @@ void GFXOutputDev::stroke(GfxState *state)
 
 void GFXOutputDev::fill(GfxState *state) 
 {
-    dbg("fill");
+    gfxcolor_t col = getFillColor(state);
+    dbg("fill %02x%02x%02x%02x",col.r,col.g,col.b,col.a);
 
     GfxPath * path = state->getPath();
     gfxline_t*line= gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
@@ -2406,19 +2408,12 @@ void GFXOutputDev::fill(GfxState *state)
 
 void GFXOutputDev::eoFill(GfxState *state) 
 {
-    dbg("eofill");
-
-    GfxPath * path = state->getPath();
     gfxcolor_t col = getFillColor(state);
+    dbg("eofill %02x%02x%02x%02x",col.r,col.g,col.b,col.a);
 
+    GfxPath * path = state->getPath();
     gfxline_t*line= gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
-
-    if(getLogLevel() >= LOGLEVEL_TRACE)  {
-        msg("<trace> eofill\n");
-        dump_outline(line);
-    }
-
-    device->fill(device, line, &col);
+    fillGfxLine(state, line);
     gfxline_free(line);
 }
 
@@ -2717,6 +2712,10 @@ void GFXOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Funct
     states[statepos].softmask = 1;
 }
 
+static inline Guchar div255(int x) {
+  return (Guchar)((x + (x >> 8) + 0x80) >> 8);
+}
+
 void GFXOutputDev::clearSoftMask(GfxState *state)
 {
     if(!states[statepos].softmask)
@@ -2754,6 +2753,7 @@ void GFXOutputDev::clearSoftMask(GfxState *state)
 
     gfxdevice_t belowrender;
     gfxdevice_render_init(&belowrender);
+    belowrender.setparameter(&belowrender, "fillwhite", "1"); //for isolated=0?
     belowrender.setparameter(&belowrender, "antialize", "2");
     belowrender.startpage(&belowrender, width, height);
     gfxresult_record_replay(below, &belowrender);
@@ -2779,14 +2779,12 @@ void GFXOutputDev::clearSoftMask(GfxState *state)
 	gfxcolor_t* l1 = &maskimg->data[maskimg->width*y];
 	gfxcolor_t* l2 = &belowimg->data[belowimg->width*y];
 	for(x=0;x<width;x++) {
-	    l1->a = 255;
 	    l2->a = (77*l1->r + 151*l1->g + 28*l1->b) >> 8;
 
-	    /* premultiply alpha... do we need this? (depends on output device)
-	    l2->r = (l2->a*l2->r) >> 8;
-	    l2->g = (l2->a*l2->g) >> 8;
-	    l2->b = (l2->a*l2->b) >> 8;
-	    */
+	    /* premultiply alpha */
+	    l2->r = div255(l2->a*l2->r);
+	    l2->g = div255(l2->a*l2->g);
+	    l2->b = div255(l2->a*l2->b);
 
 	    l1++;
 	    l2++;