X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=288de6eba2ae9429b7edbff9811ba649e67a9ece;hb=6a529bfa890997a55fec9ae0e0d388cf9d5276c2;hp=53a88edf2195f3ccdadb2e89bd7e93602a01d4f3;hpb=a544875e5890928e8a104d05bfdf4f655a9b2f4c;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index 53a88ed..288de6e 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -596,13 +596,6 @@ void GFXOutputDev::setParameter(const char*key, const char*value)
         this->config_fontquality = atof(value);
 	if(this->config_fontquality<=1)
 	    this->config_fontquality=1;
-    } else if(!strcmp(key,"help")) {
-	printf("\nPDF layer options:\n");
-	printf("breakonwarning=0/1  Abort conversion if graphic objects are found which\n");
-	printf("                    are not 100%% supported\n");
-	printf("transparent=0/1     Make PDF transparent (alpha background)\n");
-	printf("extrafontdata=0/1   Store Type3 characters and capture characters\n");
-	printf("fontquality=1..100  Curve approximation quality of the fonts\n");
     }
     
 }
@@ -1083,8 +1076,6 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags)
 	this->transformXY(state, 1, 1, &tx2, &ty2);
         double f = sqrt(sqr(tx2-tx1)+sqr(ty2-ty1)) / SQRT2;
 
-	f = 1.0; //disable dash length transform for now
-
 	msg("<trace> %d dashes", this->dashLength);
 	msg("<trace> |  phase: %f", this->dashStart);
 	for(t=0;t<this->dashLength;t++) {
@@ -1965,8 +1956,8 @@ unsigned char* antialize(unsigned char*data, int width, int height, int newwidth
     unsigned char*newdata;
     int x,y;
     newdata= (unsigned char*)malloc(newwidth*newheight);
-    double fx = (double)(width)/newwidth;
-    double fy = (double)(height)/newheight;
+    double fx = ((double)width)/newwidth;
+    double fy = ((double)height)/newheight;
     double px = 0;
     int blocksize = (int)(8192/(fx*fy));
     int r = 8192*256/palettesize;
@@ -1974,17 +1965,21 @@ unsigned char* antialize(unsigned char*data, int width, int height, int newwidth
 	double ex = px + fx;
 	int fromx = (int)px;
 	int tox = (int)ex;
-	int xweight1 = (int)(((fromx+1)-px)*256);
+	int xweight1 = (int)((1-(px-fromx))*256);
 	int xweight2 = (int)((ex-tox)*256);
 	double py =0;
 	for(y=0;y<newheight;y++) {
 	    double ey = py + fy;
 	    int fromy = (int)py;
 	    int toy = (int)ey;
-	    int yweight1 = (int)(((fromy+1)-py)*256);
+	    int yweight1 = (int)((1-(py-fromy))*256);
 	    int yweight2 = (int)((ey-toy)*256);
 	    int a = 0;
 	    int xx,yy;
+            if(tox>=width) 
+                tox = width-1;
+            if(toy>=height) 
+                toy = height-1;
 	    for(xx=fromx;xx<=tox;xx++)
 	    for(yy=fromy;yy<=toy;yy++) {
 		int b = 1-data[width*yy+xx];
@@ -2052,6 +2047,7 @@ static void drawimage(gfxdevice_t*dev, gfxcolor_t* data, int sizex,int sizey,
 	/* TODO: pass image_dpi to device instead */
 	dev->setparameter(dev, "next_bitmap_is_jpeg", "1");
 
+    dump_outline(&p1);
     dev->fillbitmap(dev, &p1, &img, &m, 0);
 }
 
@@ -2147,6 +2143,16 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
   this->transformXY(state, 1, 0, &x3, &y3);
   this->transformXY(state, 1, 1, &x4, &y4);
 
+  if(type3active) {
+      /* as type 3 bitmaps are antialized, we need to place them
+	 at integer coordinates, otherwise flash player's antializing
+	 will kick in and make everything blurry */
+      x1 = (int)(x1);y1 = (int)(y1);
+      x2 = (int)(x2);y2 = (int)(y2);
+      x3 = (int)(x3);y3 = (int)(y3);
+      x4 = (int)(x4);y4 = (int)(y4);
+  }
+
   if(!pbminfo && !(str->getKind()==strDCT)) {
       if(!type3active) {
 	  msg("<notice> File contains pbm pictures %s",mask?"(masked)":"");
@@ -2201,7 +2207,7 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 	    delete imgStr;
 	    return;
 	  }
-
+          
 	  width = realwidth;
 	  height = realheight;
 	  delete[] pic;
@@ -2217,6 +2223,7 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 	      pal[t].b = colToByte(rgb.b);
 	      pal[t].a = (unsigned char)(t*r);
 	  }
+          
       }
 
       gfxcolor_t*pic2 = new gfxcolor_t[width*height];