X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=4e623b0a2161b3ad7e8da2794535bec681bf4ffd;hb=c4bf7f42ef038c285b5a53f0a43f68f5c7f339e6;hp=4ef79725dff371f304962b4d6c78c282bf3d6482;hpb=36f562f4988603a630302892dc63d5588d48b010;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index 4ef7972..4e623b0 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -82,6 +82,7 @@ typedef struct _swfoutput_internal
     int config_filloverlap;
     int config_protect;
     int config_bboxvars;
+    RGBA config_linkcolor;
     float config_minlinewidth;
     double config_caplinewidth;
     char* config_linktarget;
@@ -224,6 +225,9 @@ static swfoutput_internal* init_internal_struct()
     i->config_caplinewidth=1;
     i->config_linktarget=0;
 
+    i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255;
+    i->config_linkcolor.a = 0x40;
+
     return i;
 };
 
@@ -1533,8 +1537,9 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf
     myshapeid2 = getNewID(dev);
     i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
     swf_ShapeNew(&i->shape);
-    rgb.r = rgb.b = rgb.a = rgb.g = 255;
-    rgb.a = 40;
+    
+    rgb = i->config_linkcolor;
+
     fsid = swf_ShapeAddSolidFillStyle(i->shape,&rgb);
     swf_SetU16(i->tag, myshapeid2);
     r.xmin = (int)(bbox.xmin*20);
@@ -1654,6 +1659,8 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	i->config_jpegsubpixels = atof(value);
     } else if(!strcmp(name, "ppmsubpixels")) {
 	i->config_ppmsubpixels = atof(value);
+    } else if(!strcmp(name, "subpixels")) {
+	i->config_ppmsubpixels = i->config_jpegsubpixels = atof(value);
     } else if(!strcmp(name, "drawonlyshapes")) {
 	i->config_drawonlyshapes = atoi(value);
     } else if(!strcmp(name, "ignoredraworder")) {
@@ -1709,6 +1716,22 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel
 	if(v<1) v = 1;
 	i->config_fontsplinemaxerror = v;
+    } else if(!strcmp(name, "linkcolor")) {
+	if(strlen(value)!=8) {
+	    fprintf(stderr, "Unknown format for option 'linkcolor'. (%s <-> RRGGBBAA)\n", value);
+	    return 1;
+	}
+#	define NIBBLE(s) (((s)>='0' && (s)<='9')?((s)-'0'):((s)&0x0f)+9)
+	i->config_linkcolor.r = NIBBLE(value[0])<<4 | NIBBLE(value[1]);
+	i->config_linkcolor.g = NIBBLE(value[2])<<4 | NIBBLE(value[3]);
+	i->config_linkcolor.b = NIBBLE(value[4])<<4 | NIBBLE(value[5]);
+	i->config_linkcolor.a = NIBBLE(value[6])<<4 | NIBBLE(value[7]);
+	printf("%02x%02x%02x%02x\n", 
+	    i->config_linkcolor.r,
+	    i->config_linkcolor.g,
+	    i->config_linkcolor.b,
+	    i->config_linkcolor.a);
+
     } else {
 	fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value);
 	return 0;
@@ -2288,6 +2311,7 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id)
 {
     SWFFONT*swffont = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
     int t;
+    SRECT bounds = {0,0,0,0};
     swffont->id = -1;
     swffont->version = 2;
     swffont->name = (U8*)strdup(id);
@@ -2336,7 +2360,19 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id)
 	swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw);
 	swffont->layout->bounds[t] = swf_ShapeDrawerGetBBox(&draw);
 	draw.dealloc(&draw);
+
+	swf_ExpandRect2(&bounds, &swffont->layout->bounds[t]);
+    }
+    if(bounds.ymin < 0 && bounds.ymax > 0) {
+	swffont->layout->ascent = -bounds.ymin;
+	swffont->layout->descent = bounds.ymax;
+	swffont->layout->leading = bounds.ymax - bounds.ymin;
+    } else {
+	swffont->layout->ascent = (bounds.ymax - bounds.ymin)/2;
+	swffont->layout->descent = (bounds.ymax - bounds.ymin)/2;
+	swffont->layout->leading = bounds.ymax - bounds.ymin;
     }
+
     return swffont;
 }