X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=dee94f94fda61ac94161bff4ea12dce7f8cd6587;hp=73c94e22a73078f540fbcc8b0df5f7325e6860da;hb=5e60b81690ac5883abe4f68b61814b8764604fd1;hpb=c7d1f6a33a15440a009e99118b8b91d124a18125

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index 73c94e2..dee94f9 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -58,7 +58,7 @@
 #include "OutputDev.h"
 #include "GfxFont.h"
 #include "GfxState.h"
-#include "NameToUnicodeTable.h"
+//#include "NameToUnicodeTable.h"
 #include "GlobalParams.h"
 #include "GFXOutputDev.h"
 
@@ -132,7 +132,7 @@ static void dbg(const char*format, ...)
     if(!verbose)
 	return;
     va_start(arglist, format);
-    vsprintf(buf, format, arglist);
+    vsnprintf(buf, sizeof(buf)-1, format, arglist);
     va_end(arglist);
     l = strlen(buf);
     while(l && buf[l-1]=='\n') {
@@ -335,6 +335,19 @@ GFXGlobalParams::~GFXGlobalParams()
 #endif
 }
 #ifdef HAVE_FONTCONFIG
+static char stralphacmp(const char*s1, const char*s2)
+{
+    while(*s1 && *s2) {
+	/* skip over space, minus, comma etc. */
+	while(*s1>=32 && *s1<=63) s1++;
+	while(*s2>=32 && *s2<=63) s2++;
+	if(*s1!=*s2)
+	    break;
+	s1++;s2++;
+    }
+    return *s1 - *s2;
+}
+
 static char fc_ismatch(FcPattern*match, char*family, char*style)
 {
     char*fcfamily=0,*fcstyle=0,*fcfullname=0,*filename=0;
@@ -348,7 +361,7 @@ static char fc_ismatch(FcPattern*match, char*family, char*style)
     if(scalable!=FcTrue || outline!=FcTrue)
 	return 0;
 
-    if (!strcasecmp(fcfamily, family)) {
+    if (!stralphacmp(fcfamily, family)) {
 	msg("<debug> Font %s-%s (%s) is a match for %s%s%s", fcfamily, fcstyle, filename, family, style?"-":"", style?style:"");
 	return 1;
     } else {
@@ -419,6 +432,7 @@ char* fontconfig_searchForFont(char*name)
         fontfile_t*fd = global_fonts;
         while(fd) {
             FcConfigAppFontAddFile(config, (FcChar8*)fd->filename);
+            msg("<debug> Adding font %s to fontconfig", fd->filename);
             fd = fd->next;
         }
 
@@ -432,17 +446,23 @@ char* fontconfig_searchForFont(char*name)
 
 	if(getLogLevel() >= LOGLEVEL_TRACE) {
 	    int t;
-	    for(t=0;t<set->nfont;t++) {
-		char*fcfamily=0,*fcstyle=0,*filename=0;
-		FcBool scalable=FcFalse, outline=FcFalse;
-		FcPatternGetString(set->fonts[t], "family", 0, (FcChar8**)&fcfamily);
-		FcPatternGetString(set->fonts[t], "style", 0, (FcChar8**)&fcstyle);
-		FcPatternGetString(set->fonts[t], "file", 0, (FcChar8**)&filename);
-		FcPatternGetBool(set->fonts[t], "outline", 0, &outline);
-		FcPatternGetBool(set->fonts[t], "scalable", 0, &scalable);
-		if(scalable && outline) {
-		    msg("<trace> %s-%s -> %s", fcfamily, fcstyle, filename);
+	    int p;
+	    for(p=0;p<2;p++) {
+		if(set) {
+		    for(t=0;t<set->nfont;t++) {
+			char*fcfamily=0,*fcstyle=0,*filename=0;
+			FcBool scalable=FcFalse, outline=FcFalse;
+			FcPatternGetString(set->fonts[t], "family", 0, (FcChar8**)&fcfamily);
+			FcPatternGetString(set->fonts[t], "style", 0, (FcChar8**)&fcstyle);
+			FcPatternGetString(set->fonts[t], "file", 0, (FcChar8**)&filename);
+			FcPatternGetBool(set->fonts[t], "outline", 0, &outline);
+			FcPatternGetBool(set->fonts[t], "scalable", 0, &scalable);
+			if(scalable && outline) {
+			    msg("<trace> %s (%s) -> %s", fcfamily, fcstyle, filename);
+			}
+		    }
 		}
+		set =  FcConfigGetFonts(config, FcSetApplication);
 	    }
 	}
     }
@@ -450,6 +470,8 @@ char* fontconfig_searchForFont(char*name)
     char*family = strdup(name);
     char*style = 0;
     char*dash = strchr(family, '-');
+    if(!dash) dash = strchr(family, ',');
+
     FcPattern*pattern = 0;
     if(dash) {
 	*dash = 0;
@@ -506,7 +528,7 @@ static DisplayFontParamKind detectFontType(const char*filename)
 
 DisplayFontParam *GFXGlobalParams::getDisplayFont(GString *fontName)
 {
-    msg("<verbose> looking for font %s in global params", fontName->getCString());
+    msg("<verbose> looking for font %s", fontName->getCString());
 
     char*name = fontName->getCString();
     
@@ -565,8 +587,10 @@ DisplayFontParam *GFXGlobalParams::getDisplayFont(GString *fontName)
 	}
 	free(filename);
         return dfp;
+    } else {
+	msg("<verbose> Font %s not found\n", name);
+	return GlobalParams::getDisplayFont(fontName);
     }
-    return GlobalParams::getDisplayFont(fontName);
 }
 
 GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)
@@ -589,6 +613,7 @@ GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)
     this->user_clipy1 = 0;
     this->user_clipx2 = 0;
     this->user_clipy2 = 0;
+    this->current_gfxfont = 0;
     this->current_fontinfo = 0;
     this->current_text_stroke = 0;
     this->current_text_clip = 0;
@@ -599,9 +624,10 @@ GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)
     this->config_remapunicode=0;
     this->config_transparent=0;
     this->config_extrafontdata = 0;
-    this->config_optimize_polygons = 0;
+    this->config_drawonlyshapes = 0;
+    this->config_disable_polygon_conversion = 0;
     this->config_multiply = 1;
-    this->dashPattern = 0;
+    this->config_linkdatafile = 0;
     this->page2page = 0;
     this->num_pages = 0;
   
@@ -616,16 +642,20 @@ void GFXOutputDev::setParameter(const char*key, const char*value)
         this->config_remapunicode = atoi(value);
     } else if(!strcmp(key,"transparent")) {
         this->config_transparent = atoi(value);
+    } else if(!strcmp(key,"drawonlyshapes")) {
+        this->config_drawonlyshapes = atoi(value);
     } else if(!strcmp(key,"extrafontdata")) {
         this->config_extrafontdata = atoi(value);
+    } else if(!strcmp(key,"linkdatafile")) {
+        this->config_linkdatafile = strdup(value);
     } else if(!strcmp(key,"convertgradients")) {
         this->config_convertgradients = atoi(value);
     } else if(!strcmp(key,"multiply")) {
         this->config_multiply = atoi(value);
         if(this->config_multiply<1) 
             this->config_multiply=1;
-    } else if(!strcmp(key,"optimize_polygons")) {
-        this->config_optimize_polygons = atoi(value);
+    } else if(!strcmp(key,"disable_polygon_conversion")) {
+        this->config_disable_polygon_conversion = atoi(value);
     }
 }
   
@@ -792,6 +822,31 @@ void dump_outline(gfxline_t*line)
     }
 }
 
+void gfxPath_dump(GfxPath*path)
+{
+    int num = path->getNumSubpaths();
+    int t;
+    int cpos=0;
+    for(t = 0; t < num; t++) {
+	GfxSubpath *subpath = path->getSubpath(t);
+	int subnum = subpath->getNumPoints();
+        int s;	
+        for(s=0;s<subnum;s++) {
+	   double x=subpath->getX(s);
+           double y=subpath->getY(s);
+	   if(s==0 && !subpath->getCurve(s)) {
+                printf("M %f %f\n", x, y);
+           } else if(s==0 && subpath->getCurve(s)) {
+                printf("E %f %f\n", x, y);
+	   } else if(subpath->getCurve(s)) {
+                printf("C %f %f\n", x, y);
+	   } else {
+                printf("T %f %f\n", x, y);
+	   }
+	}
+    }
+}
+
 gfxline_t* GFXOutputDev::gfxPath_to_gfxline(GfxState*state, GfxPath*path, int closed, int user_movex, int user_movey)
 {
     int num = path->getNumSubpaths();
@@ -941,7 +996,8 @@ GBool GFXOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading)
 	    colToByte(color2.c[0]), colToByte(color2.c[1]), colToByte(color2.c[2]));
     infofeature("radial shaded fills");
 
-    gfxgradient_t*g = (gfxgradient_t*)malloc(sizeof(gfxgradient_t)*3);
+    gfxgradient_t gr[3];
+    gfxgradient_t*g = &gr[0];
     g[0].next = &g[1];
     g[1].next = &g[2];
     g[2].next = 0;
@@ -1057,7 +1113,6 @@ void GFXOutputDev::endPage()
 	device->endclip(device);
 	outer_clip_box = 0;
     }
-    this->dashPattern = 0;
     /* notice: we're not fully done yet with this page- there might still be 
        a few calls to drawLink() yet to come */
 }
@@ -1089,16 +1144,21 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags)
     if(lineCap == 0) capType = gfx_capButt;
     else if(lineCap == 1) capType = gfx_capRound;
     else if(lineCap == 2) capType = gfx_capSquare;
+    else msg("<error> Invalid line cap type");
 
     gfx_joinType joinType = gfx_joinRound;
     if(lineJoin == 0) joinType = gfx_joinMiter;
     else if(lineJoin == 1) joinType = gfx_joinRound;
     else if(lineJoin == 2) joinType = gfx_joinBevel;
+    else msg("<error> Invalid line join type");
 
     gfxline_t*line2 = 0;
 
-    if(this->dashLength && this->dashPattern) {
-	float * dash = (float*)malloc(sizeof(float)*(this->dashLength+1));
+    int dashLength = states[statepos].dashLength;
+    double*dashPattern = states[statepos].dashPattern;
+    double dashStart = states[statepos].dashStart;
+    if(dashLength && dashPattern) {
+	float * dash = (float*)malloc(sizeof(float)*(dashLength+1));
 	int t;
 
         /* try to find out how much the transformation matrix would
@@ -1109,26 +1169,33 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags)
            the current transformation matrix. However there are few
            PDFs which actually stretch a dashed path in a non-orthonormal
            way */
-        double tx1, ty1, tx2, ty2;
+        double tx1, ty1, tx2, ty2, tx3, ty3;
 	this->transformXY(state, 0, 0, &tx1, &ty1);
-	this->transformXY(state, 1, 1, &tx2, &ty2);
-        double f = sqrt(sqr(tx2-tx1)+sqr(ty2-ty1)) / SQRT2;
-
-	msg("<trace> %d dashes", this->dashLength);
-	msg("<trace> |  phase: %f", this->dashStart);
-	for(t=0;t<this->dashLength;t++) {
-	    dash[t] = (float)this->dashPattern[t] * f;
-            if(!dash[t])
+	this->transformXY(state, 0, 1, &tx2, &ty2);
+	this->transformXY(state, 1, 0, &tx3, &ty3);
+        double d1 = sqrt(sqr(tx2-tx1)+sqr(ty2-ty1));
+        double d2 = sqrt(sqr(tx3-tx1)+sqr(ty3-ty1));
+        if(fabs(d1-d2)>0.5)
+            warnfeature("non-ortogonally dashed strokes", 0);
+        double f = (d1+d2)/2;
+
+	msg("<trace> %d dashes", dashLength);
+	msg("<trace> |  phase: %f", dashStart);
+	for(t=0;t<dashLength;t++) {
+	    dash[t] = (float)dashPattern[t] * f;
+            if(!dash[t]) {
                 dash[t] = 1e-37;
-	    msg("<trace> |  d%-3d: %f", t, this->dashPattern[t]);
+            }
+	    msg("<trace> |  d%-3d: %f", t, dashPattern[t]);
 	}
-	dash[this->dashLength] = -1;
+	dash[dashLength] = -1;
 	if(getLogLevel() >= LOGLEVEL_TRACE) {
 	    dump_outline(line);
 	}
+        
+        line2 = gfxtool_dash_line(line, dash, (float)(dashStart*f));
+        line = line2;
 
-	line2 = gfxtool_dash_line(line, dash, (float)(this->dashStart*f));
-	line = line2;
 	free(dash);
 	msg("<trace> After dashing:");
     }
@@ -1137,16 +1204,16 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags)
         msg("<trace> stroke width=%f join=%s cap=%s dashes=%d color=%02x%02x%02x%02x",
 		width,
 		lineJoin==0?"miter": (lineJoin==1?"round":"bevel"),
-		lineCap==0?"butt": (lineJoin==1?"round":"square"),
-		this->dashLength,
+		lineCap==0?"butt": (lineCap==1?"round":"square"),
+		dashLength,
 		col.r,col.g,col.b,col.a
 		);
         dump_outline(line);
     }
 
     if(flags&STROKE_FILL) {
-        gfxpoly_t* poly = gfxpoly_strokeToPoly(line, width, capType, joinType, miterLimit);
-        gfxline_t*gfxline = gfxpoly_to_gfxline(poly);
+        gfxpoly_t* poly = gfxpoly_from_stroke(line, width, capType, joinType, miterLimit, DEFAULT_GRID);
+        gfxline_t*gfxline = gfxline_from_gfxpoly(poly);
 	if(getLogLevel() >= LOGLEVEL_TRACE)  {
 	    dump_outline(gfxline);
 	}
@@ -1160,7 +1227,7 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags)
             device->fill(device, gfxline, &col);
         }
         gfxline_free(gfxline);
-	gfxpoly_free(poly);
+	gfxpoly_destroy(poly);
     } else {
         if(flags&STROKE_CLIP) 
             msg("<error> Stroke&clip not supported at the same time");
@@ -1184,20 +1251,21 @@ gfxcolor_t getFillColor(GfxState * state)
     return col;
 }
 
-void GFXOutputDev::fillGfxLine(GfxState *state, gfxline_t*line) 
+void GFXOutputDev::fillGfxLine(GfxState *state, gfxline_t*line, char evenodd) 
 {
     gfxcolor_t col = getFillColor(state);
 
     if(getLogLevel() >= LOGLEVEL_TRACE)  {
-        msg("<trace> fill %02x%02x%02x%02x", col.r, col.g, col.b, col.a);
+        msg("<trace> %sfill %02x%02x%02x%02x", evenodd?"eo":"", col.r, col.g, col.b, col.a);
         dump_outline(line);
     }
     device->fill(device, line, &col);
 }
 
-void GFXOutputDev::clipToGfxLine(GfxState *state, gfxline_t*line) 
+void GFXOutputDev::clipToGfxLine(GfxState *state, gfxline_t*line, char evenodd) 
 {
     if(getLogLevel() >= LOGLEVEL_TRACE)  {
+        msg("<trace> %sclip", evenodd?"eo":"");
         dump_outline(line);
     }
     gfxbbox_t bbox = gfxline_getbbox(line);
@@ -1212,12 +1280,12 @@ void GFXOutputDev::clip(GfxState *state)
     GfxPath * path = state->getPath();
     msg("<trace> clip");
     gfxline_t*line = gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
-    if(config_optimize_polygons) {
-	gfxline_t*line2 = gfxline_circularToEvenOdd(line);
+    if(!config_disable_polygon_conversion) {
+	gfxline_t*line2 = gfxpoly_circular_to_evenodd(line, DEFAULT_GRID);
 	gfxline_free(line);
 	line = line2;
     }
-    clipToGfxLine(state, line);
+    clipToGfxLine(state, line, 0);
     gfxline_free(line);
 }
 
@@ -1225,7 +1293,7 @@ void GFXOutputDev::eoClip(GfxState *state)
 {
     GfxPath * path = state->getPath();
     gfxline_t*line = gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
-    clipToGfxLine(state, line);
+    clipToGfxLine(state, line, 1);
     gfxline_free(line);
 }
 void GFXOutputDev::clipToStrokePath(GfxState *state)
@@ -1256,9 +1324,6 @@ void GFXOutputDev::finish()
 GFXOutputDev::~GFXOutputDev() 
 {
     finish();
-    if(this->dashPattern) {
-        free(this->dashPattern);this->dashPattern = 0;
-    }
 };
 GBool GFXOutputDev::upsideDown() 
 {
@@ -1328,7 +1393,6 @@ void GFXOutputDev::beginString(GfxState *state, GString *s)
     if(current_text_stroke) {
 	msg("<error> Error: Incompatible change of text rendering to %d while inside cliptext", render);
     }
-
     msg("<trace> beginString(%s) render=%d", makeStringPrintable(s->getCString()), render);
 }
 
@@ -1377,13 +1441,43 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
     }
 
     Unicode u = uLen?(_u[0]):0;
-    msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d render=%d glyphid=%d font=%08x",x,y,(charid&127)>=32?charid:'?', charid, u, uLen, font->isCIDFont(), render, glyphid, current_gfxfont);
 
     gfxmatrix_t m = this->current_font_matrix;
     this->transformXY(state, x-originX, y-originY, &m.tx, &m.ty);
     //m.tx += originX; m.ty += originY;
-
-    if(render == RENDER_FILL || render == RENDER_INVISIBLE) {
+    
+    msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d render=%d glyphid=%d font=%p",m.tx,m.ty,(charid&127)>=32?charid:'?', charid, u, uLen, font->isCIDFont(), render, glyphid, current_gfxfont);
+
+    if((render == RENDER_FILL && !config_drawonlyshapes) ||
+       (render == RENDER_FILLSTROKE && state->getTransformedLineWidth()<1.0) ||
+       (render == RENDER_INVISIBLE)) {
+
+	int space = this->current_fontinfo->space_char;
+	if(config_extrafontdata && space>=0 && m.m00 && !m.m01) {
+	    /* space char detection */
+	    if(last_char_gfxfont == current_gfxfont && 
+	       last_char_y == m.ty &&
+	       !last_char_was_space) {
+		double expected_x = last_char_x + current_gfxfont->glyphs[last_char].advance*m.m00;
+		int space = this->current_fontinfo->space_char;
+		float width = this->current_fontinfo->average_advance;
+		if(m.tx - expected_x >= m.m00*width*4/10) {
+		    msg("<debug> There's a %f pixel gap between char %d and char %d (expected no more than %f), I'm inserting a space here", 
+			    m.tx-expected_x, 
+			    width*m.m00*4/10,
+			    last_char, glyphid);
+		    gfxmatrix_t m2 = m;
+		    m2.tx = expected_x + (m.tx - expected_x - current_gfxfont->glyphs[space].advance*m.m00)/2;
+		    if(m2.tx < expected_x) m2.tx = expected_x;
+		    device->drawchar(device, current_gfxfont, space, &col, &m2);
+		}
+	    }
+	    last_char_gfxfont = current_gfxfont;
+	    last_char = glyphid;
+	    last_char_x = m.tx;
+	    last_char_y = m.ty;
+	    last_char_was_space = GLYPH_IS_SPACE(&current_gfxfont->glyphs[glyphid]);
+	}
 	device->drawchar(device, current_gfxfont, glyphid, &col, &m);
     } else {
 	msg("<debug> Drawing glyph %d as shape", charid);
@@ -1391,6 +1485,7 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
 	    msg("<notice> Some texts will be rendered as shape");
 	    gfxglobals->textmodeinfo = 1;
 	}
+
 	gfxline_t*glyph = current_gfxfont->glyphs[glyphid].line;
 	gfxline_t*tglyph = gfxline_clone(glyph);
 	gfxline_transform(tglyph, &m);
@@ -1412,7 +1507,7 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
 void GFXOutputDev::endString(GfxState *state) 
 { 
     int render = state->getRender();
-    msg("<trace> endString() render=%d textstroke=%08x", render, current_text_stroke);
+    msg("<trace> endString() render=%d textstroke=%p", render, current_text_stroke);
     
     if(current_text_stroke) {
 	/* fillstroke and stroke text rendering objects we can process right
@@ -1421,11 +1516,11 @@ void GFXOutputDev::endString(GfxState *state)
 	   however */
 	device->setparameter(device, "mark","TXT");
 	if((render&3) == RENDER_FILL) {
-	    fillGfxLine(state, current_text_stroke);
+	    fillGfxLine(state, current_text_stroke, 0);
 	    gfxline_free(current_text_stroke);
 	    current_text_stroke = 0;
 	} else if((render&3) == RENDER_FILLSTROKE) {
-	    fillGfxLine(state, current_text_stroke);
+	    fillGfxLine(state, current_text_stroke, 0);
 	    strokeGfxline(state, current_text_stroke,0);
 	    gfxline_free(current_text_stroke);
 	    current_text_stroke = 0;
@@ -1441,11 +1536,11 @@ void GFXOutputDev::endString(GfxState *state)
 void GFXOutputDev::endTextObject(GfxState *state)
 {
     int render = state->getRender();
-    msg("<trace> endTextObject() render=%d textstroke=%08x clipstroke=%08x", render, current_text_stroke, current_text_clip);
+    msg("<trace> endTextObject() render=%d textstroke=%p clipstroke=%p", render, current_text_stroke, current_text_clip);
     
     if(current_text_clip) {
 	device->setparameter(device, "mark","TXT");
-	clipToGfxLine(state, current_text_clip);
+	clipToGfxLine(state, current_text_clip, 0);
 	device->setparameter(device, "mark","");
 	gfxline_free(current_text_clip);
 	current_text_clip = 0;
@@ -1474,10 +1569,11 @@ GBool GFXOutputDev::beginType3Char(GfxState *state, double x, double y, double d
 
 	gfxmatrix_t m = this->current_font_matrix;
 	this->transformXY(state, 0, 0, &m.tx, &m.ty);
-	m.m00*=INTERNAL_FONT_SIZE;
+
+	/*m.m00*=INTERNAL_FONT_SIZE;
 	m.m01*=INTERNAL_FONT_SIZE;
 	m.m10*=INTERNAL_FONT_SIZE;
-	m.m11*=INTERNAL_FONT_SIZE;
+	m.m11*=INTERNAL_FONT_SIZE;*/
 
 	if(!current_fontinfo || (unsigned)charid >= current_fontinfo->num_glyphs || !current_fontinfo->glyphs[charid]) {
 	    msg("<error> Invalid charid %d for font", charid);
@@ -1566,9 +1662,11 @@ void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doubl
     states[statepos].clipbbox.xmax = x2;
     states[statepos].clipbbox.ymax = y2;
     
-    this->dashPattern = 0;
-    this->dashLength = 0;
-    this->dashStart = 0;
+    states[statepos].dashPattern = 0;
+    states[statepos].dashLength = 0;
+    states[statepos].dashStart = 0;
+    
+    this->last_char_gfxfont = 0;
 }
 
 
@@ -1757,16 +1855,21 @@ void GFXOutputDev::processLink(Link *link, Catalog *catalog)
     else if(s)
     {
         device->drawlink(device, points, s);
+	if(this->config_linkdatafile) {
+	    FILE*fi = fopen(config_linkdatafile, "ab+");
+	    fprintf(fi, "%s\n", s);
+	    fclose(fi);
+	}
     }
-
+        
     msg("<verbose> \"%s\" link to \"%s\" (%d)", type, FIXNULL(s), page);
     free(s);s=0;
 }
 
 void GFXOutputDev::saveState(GfxState *state) {
-    dbg("saveState %08x", state); dbgindent+=2;
+    dbg("saveState %p", state); dbgindent+=2;
 
-    msg("<trace> saveState %08x", state);
+    msg("<trace> saveState %p", state);
     updateAll(state);
     if(statepos>=64) {
       msg("<fatal> Too many nested states in pdf.");
@@ -1779,21 +1882,33 @@ void GFXOutputDev::saveState(GfxState *state) {
     states[statepos].clipping = 0;
     states[statepos].olddevice = 0;
     states[statepos].clipbbox = states[statepos-1].clipbbox;
+
+    states[statepos].dashPattern = states[statepos-1].dashPattern;
+    states[statepos].dashStart = states[statepos-1].dashStart;
+    states[statepos].dashLength = states[statepos-1].dashLength;
 };
 
 void GFXOutputDev::restoreState(GfxState *state) {
-  dbgindent-=2; dbg("restoreState %08x", state);
+  dbgindent-=2; dbg("restoreState %p", state);
 
   if(statepos==0) {
       msg("<fatal> Invalid restoreState");
       exit(1);
   }
-  msg("<trace> restoreState %08x%s%s", state,
+  msg("<trace> restoreState %p%s%s", state,
 	                          states[statepos].softmask?" (end softmask)":"",
 	                          states[statepos].clipping?" (end clipping)":"");
   if(states[statepos].softmask) {
       clearSoftMask(state);
   }
+
+  if(states[statepos].dashPattern) {
+      if(!statepos || states[statepos-1].dashPattern != states[statepos].dashPattern) {
+          free(states[statepos].dashPattern);
+          states[statepos].dashPattern = 0;
+      }
+  }
+
   updateAll(state);
   
   while(states[statepos].clipping) {
@@ -1802,6 +1917,13 @@ void GFXOutputDev::restoreState(GfxState *state) {
   }
   if(states[statepos].state!=state) {
       msg("<fatal> bad state nesting");
+      if(verbose) {
+	  int t;
+	  for(t=0;t<=statepos;t++) {
+	      printf("%p ", states[t].state);
+	  }
+	  printf("\n");
+      }
       exit(1);
   }
   states[statepos].state=0;
@@ -1810,18 +1932,25 @@ void GFXOutputDev::restoreState(GfxState *state) {
  
 void GFXOutputDev::updateLineDash(GfxState *state) 
 {
-    if(this->dashPattern) {
-        free(this->dashPattern);this->dashPattern = 0;
+    if(states[statepos].dashPattern &&
+       (!statepos || states[statepos-1].dashPattern != states[statepos].dashPattern)) {
+        free(states[statepos].dashPattern);
+        states[statepos].dashPattern = 0;
     }
     double *pattern = 0;
-    state->getLineDash(&pattern, &this->dashLength, &this->dashStart);
-    msg("<debug> updateLineDash, %d dashes", this->dashLength);
-    if(!this->dashLength) {
-        this->dashPattern = 0;
+    int dashLength;
+    double dashStart;
+    state->getLineDash(&pattern, &dashLength, &dashStart);
+    msg("<debug> updateLineDash, %d dashes", dashLength);
+    if(!dashLength) {
+        states[statepos].dashPattern = 0;
+        states[statepos].dashLength = 0;
     } else {
-        double*p = (double*)malloc(this->dashLength*sizeof(this->dashPattern[0]));
-        memcpy(p, pattern, this->dashLength*sizeof(this->dashPattern[0]));
-        this->dashPattern = p;
+        double*p = (double*)malloc(dashLength*sizeof(states[statepos].dashPattern[0]));
+        memcpy(p, pattern, dashLength*sizeof(states[statepos].dashPattern[0]));
+        states[statepos].dashPattern = p;
+        states[statepos].dashLength = dashLength;
+        states[statepos].dashStart = dashStart;
     }
 }
   
@@ -1919,7 +2048,7 @@ void GFXOutputDev::updateFont(GfxState *state)
     current_gfxfont = this->current_fontinfo->getGfxFont();
     device->addfont(device, current_gfxfont);
     free(id);
-
+    
     updateFontMatrix(state);
 }
 
@@ -2265,38 +2394,18 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
       for(t=0;t<256;t++) {
 	  pixBuf[0] = t;
 	  colorMap->getRGB(pixBuf, &rgb);
-
-	  {/*if(maskColors && *maskColors==t) {
-	      msg("<notice> Color %d is transparent", t);
-	      if (imgData->maskColors) {
-		*alpha = 0;
-		for (i = 0; i < imgData->colorMap->getNumPixelComps(); ++i) {
-		  if (pix[i] < imgData->maskColors[2*i] ||
-		      pix[i] > imgData->maskColors[2*i+1]) {
-		    *alpha = 1;
-		    break;
-		  }
-		}
-	      } else {
-		*alpha = 1;
-	      }
-	      if(!*alpha) {
-		    pal[t].r = 0;
-		    pal[t].g = 0;
-		    pal[t].b = 0;
-		    pal[t].a = 0;
-	      }
-	  } else {*/
-	      pal[t].r = (unsigned char)(colToByte(rgb.r));
-	      pal[t].g = (unsigned char)(colToByte(rgb.g));
-	      pal[t].b = (unsigned char)(colToByte(rgb.b));
-	      pal[t].a = 255;//(U8)(rgb.b * 255 + 0.5);
-	  }
+	  pal[t].r = (unsigned char)(colToByte(rgb.r));
+	  pal[t].g = (unsigned char)(colToByte(rgb.g));
+	  pal[t].b = (unsigned char)(colToByte(rgb.b));
+	  pal[t].a = 255;//(U8)(rgb.b * 255 + 0.5);
       }
       for (y = 0; y < height; ++y) {
 	for (x = 0; x < width; ++x) {
 	  imgStr->getPixel(pixBuf);
 	  pic[width*y+x] = pal[pixBuf[0]];
+	  if(maskColors && *maskColors==pixBuf[0]) {
+	      pic[width*y+x].a = 0;
+	  }
 	}
       }
       if(maskbitmap) {
@@ -2309,8 +2418,8 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 	  } else {
 	      msg("<verbose> resampling %dx%d to mask size (%dx%d)", width, height, maskWidth, maskHeight);
 	      gfxcolor_t*newpic=new gfxcolor_t[maskWidth*maskHeight];
-	      double dx = width / maskWidth;
-	      double dy = height / maskHeight;
+	      double dx = width / (double)maskWidth;
+	      double dy = height / (double)maskHeight;
 	      double yy = 0;
 	      for(y = 0; y < maskHeight; y++) {
 		  double xx = 0;
@@ -2417,12 +2526,12 @@ void GFXOutputDev::fill(GfxState *state)
 
     GfxPath * path = state->getPath();
     gfxline_t*line= gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
-    if(config_optimize_polygons) {
-        gfxline_t*line2 = gfxline_circularToEvenOdd(line);
+    if(!config_disable_polygon_conversion) {
+        gfxline_t*line2 = gfxpoly_circular_to_evenodd(line, DEFAULT_GRID);
         gfxline_free(line);
         line = line2;
     }
-    fillGfxLine(state, line);
+    fillGfxLine(state, line, 0);
     gfxline_free(line);
 }
 
@@ -2433,7 +2542,7 @@ void GFXOutputDev::eoFill(GfxState *state)
 
     GfxPath * path = state->getPath();
     gfxline_t*line= gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
-    fillGfxLine(state, line);
+    fillGfxLine(state, line, 1);
     gfxline_free(line);
 }
 
@@ -2453,8 +2562,8 @@ void addGlobalFont(const char*filename)
     memset(f, 0, sizeof(fontfile_t));
     f->filename = filename;
     int len = strlen(filename);
-    char*r1 = strrchr(filename, '/');
-    char*r2 = strrchr(filename, '\\');
+    char*r1 = strrchr((char*)filename, '/');
+    char*r2 = strrchr((char*)filename, '\\');
     if(r2>r1)
         r1 = r2;
     if(r1) {
@@ -2543,7 +2652,7 @@ void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
     if(blendingColorSpace) {
 	colormodename = GfxColorSpace::getColorSpaceModeName(blendingColorSpace->getMode());
     }
-    dbg("beginTransparencyGroup device=%08x %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", device, bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask);
+    dbg("beginTransparencyGroup device=%p %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", device, bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask);
     msg("<verbose> beginTransparencyGroup %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask);
     
     //states[statepos].createsoftmask |= forSoftMask;
@@ -2553,9 +2662,9 @@ void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
 
     states[statepos].olddevice = this->device;
     this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t));
-    dbg("this->device now %08x (old: %08x)", this->device, states[statepos].olddevice);
+    dbg("this->device now %p (old: %p)", this->device, states[statepos].olddevice);
 
-    gfxdevice_record_init(this->device);
+    gfxdevice_record_init(this->device, 0);
     
     /*if(!forSoftMask) { ////???
 	state->setFillOpacity(0.0);
@@ -2568,22 +2677,18 @@ void GFXOutputDev::endTransparencyGroup(GfxState *state)
     dbgindent-=2;
     gfxdevice_t*r = this->device;
 
-    dbg("endTransparencyGroup this->device now back to %08x (destroying %08x)", states[statepos].olddevice, this->device);
+    dbg("endTransparencyGroup this->device now back to %p (destroying %p)", states[statepos].olddevice, this->device);
     
     this->device = states[statepos].olddevice;
     if(!this->device) {
-	msg("<fatal> bad state nesting in transparency group- PDF file broken?");
-	/* if these errors occur more often, we should build a seperate
-	   transparency group stack, like xpdf/SplashOutputDev.cc does */
-	restoreState(state);
-	this->device = states[statepos].olddevice;
+	msg("<error> Invalid state nesting");
     }
     states[statepos].olddevice = 0;
 
     gfxresult_t*recording = r->finish(r);
     
-    dbg("                     forsoftmask=%d recording=%08x/%08x", states[statepos].createsoftmask, r, recording);
-    msg("<verbose> endTransparencyGroup forsoftmask=%d recording=%08x/%08x", states[statepos].createsoftmask, r, recording);
+    dbg("                     forsoftmask=%d recording=%p/%p", states[statepos].createsoftmask, r, recording);
+    msg("<verbose> endTransparencyGroup forsoftmask=%d recording=%p/%p", states[statepos].createsoftmask, r, recording);
 
     if(states[statepos].createsoftmask) {
 	states[statepos-1].softmaskrecording = recording;
@@ -2602,7 +2707,7 @@ void GFXOutputDev::paintTransparencyGroup(GfxState *state, double *bbox)
                                "colordodge","colorburn","hardlight","softlight","difference",
                                "exclusion","hue","saturation","color","luminosity"};
 
-    dbg("paintTransparencyGroup blend=%s softmaskon=%d recording=%08x", blendmodes[state->getBlendMode()], states[statepos].softmask, states[statepos].grouprecording);
+    dbg("paintTransparencyGroup blend=%s softmaskon=%d recording=%p", blendmodes[state->getBlendMode()], states[statepos].softmask, states[statepos].grouprecording);
     msg("<verbose> paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask);
 
     if(state->getBlendMode() == gfxBlendNormal)
@@ -2621,7 +2726,7 @@ void GFXOutputDev::paintTransparencyGroup(GfxState *state, double *bbox)
 	if(blendmode == gfxBlendMultiply && alpha>200)
 	    alpha = 128;
 	gfxdevice_t ops;
-	dbg("this->device=%08x, this->device->name=%s\n", this->device, this->device->name);
+	dbg("this->device=%p, this->device->name=%s\n", this->device, this->device->name);
 	gfxdevice_ops_init(&ops, this->device, alpha);
 	gfxresult_record_replay(grouprecording, &ops);
 	ops.finish(&ops);
@@ -2656,9 +2761,9 @@ void GFXOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Funct
     }
     states[statepos].olddevice = this->device;
     this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t));
-    gfxdevice_record_init(this->device);
+    gfxdevice_record_init(this->device, 0);
 
-    dbg("softmaskrecording is %08x (dev=%08x) at statepos %d\n", states[statepos].softmaskrecording, this->device, statepos);
+    dbg("softmaskrecording is %p (dev=%p) at statepos %d\n", states[statepos].softmaskrecording, this->device, statepos);
     
     states[statepos].softmask = 1;
     states[statepos].softmask_alpha = alpha;