From: Matthias Kramm <kramm@quiss.org>
Date: Thu, 18 Feb 2010 22:27:22 +0000 (-0800)
Subject: fixed masked image bug
X-Git-Tag: version-0-9-1~146
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=77329c490e5346658e4878f065022abb64df5324

fixed masked image bug
---

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index 3e956ec..c35cb39 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -448,16 +448,18 @@ char* fontconfig_searchForFont(char*name)
 	    int t;
 	    int p;
 	    for(p=0;p<2;p++) {
-		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);
+		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);
@@ -2415,8 +2417,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;