double config_ppmsubpixels=0;
double config_jpegsubpixels=0;
-int config_opennewwindow=0;
+int config_opennewwindow=1;
int config_ignoredraworder=0;
int config_drawonlyshapes=0;
int config_jpegquality=85;
void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit);
void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color);
void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform);
-void swf_fillgradient(gfxdevice_t*dev, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix);
+void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix);
static swfoutput_internal* init_internal_struct()
{
swf_GetMatrix(0, &m); /* set unit matrix- the real matrix is in the placeobject */
swf_SetMatrix(i->tag,&m);
+ msg("<trace> Placing text (%d characters) as ID %d", i->chardatapos, i->textid);
+
putcharacters(obj, i->tag);
swf_SetU8(i->tag,0);
i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
if(getScreenLogLevel() >= LOGLEVEL_DEBUG) {
// print font information
- msg("<debug> Font %s (%s)",swffont->name, filename);
+ msg("<debug> Font %s (%s)",fontid, filename);
msg("<debug> | ID: %d", swffont->id);
msg("<debug> | Version: %d", swffont->version);
- msg("<debug> | Name: %s", fontid);
+ msg("<debug> | Name: %s", swffont->name);
msg("<debug> | Numchars: %d", swffont->numchars);
msg("<debug> | Maxascii: %d", swffont->maxascii);
msg("<debug> | Style: %d", swffont->style);
if(filename)
close(fi);
- msg("<notice> SWF written\n");
return 1;
}
if(i->textid>=0)
endtext(obj);
- if(config_opennewwindow)
+ if(!config_opennewwindow)
actions = action_GetUrl(0, url, "_parent");
else
actions = action_GetUrl(0, url, "_this");
}
}
+/* TODO */
+static int imageInCache(swfoutput*obj, void*data, int width, int height)
+{
+ return -1;
+}
+static void addImageToCache(swfoutput*obj, void*data, int width, int height)
+{
+}
+
static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int targetheight, int* newwidth, int* newheight)
{
swfoutput*obj = i->obj;
RGBA*newpic = 0;
RGBA*mem = (RGBA*)img->data;
- int bitid = getNewID(obj);
int sizex = img->width;
int sizey = img->height;
*newheight = sizey;
if(newsizex<sizex || newsizey<sizey) {
+ msg("<notice> Scaling %dx%d image to %dx%d", sizex, sizey, newsizex, newsizey);
newpic = swf_ImageScale(mem, sizex, sizey, newsizex, newsizey);
*newwidth = sizex = newsizex;
*newheight = sizey = newsizey;
}
printf("\n");*/
- i->tag = swf_AddImage(i->tag, bitid, mem, sizex, sizey, config_jpegquality);
+ int bitid = -1;
+ int cacheid = imageInCache(obj, mem, sizex, sizey);
+
+ if(cacheid<=0) {
+ bitid = getNewID(obj);
+ i->tag = swf_AddImage(i->tag, bitid, mem, sizex, sizey, config_jpegquality);
+ addImageToCache(obj, mem, sizex, sizey);
+ } else {
+ bitid = cacheid;
+ }
if(newpic)
free(newpic);
-
return bitid;
}
ArtSVP* svp = gfxstrokeToSVP(line, width, cap_style, joint_style, miterLimit);
gfxline_t*gfxline = SVPtogfxline(svp);
dev->fill(dev, gfxline, color);
+ free(gfxline);
+ art_svp_free(svp);
}
}
void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
drawgfxline(obj, line);
msg("<trace> end of swf_fill (shapeid=%d)", i->shapeid);
}
-void swf_fillgradient(gfxdevice_t*dev, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix)
+void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix)
{
msg("<error> Gradient filling not implemented yet");
}