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;
int firstpage;
char pagefinished;
+ char overflow;
+
/* during the transition to the gfxdevice interface:
a device which uses this swfoutput as target */
gfxdevice_t device;
i->storefont = 0;
i->currentswfid = 0;
i->depth = 0;
+ i->overflow = 0;
i->startdepth = 0;
i->linewidth = 0;
i->shapeid = -1;
if(!id_error)
msg("<error> ID Table overflow");
id_error=1;
+ i->overflow = 1;
}
return ++i->currentswfid;
}
+static U16 getNewDepth(struct swfoutput* obj)
+{
+ swfoutput_internal*i = (swfoutput_internal*)obj->internal;
+ if(i->depth == 65535) {
+ if(!id_error)
+ msg("<error> Depth Table overflow");
+ id_error=1;
+ i->overflow = 1;
+ }
+ return ++i->depth;
+}
static void startshape(struct swfoutput* obj);
static void starttext(struct swfoutput* obj);
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);
- //swf_ObjectPlace(i->tag,i->textid,/*depth*/i->depth++,&i->page_matrix,NULL,NULL);
MATRIX m2;
swf_MatrixJoin(&m2,&obj->fontmatrix, &i->page_matrix);
- swf_ObjectPlace(i->tag,i->textid,/*depth*/++i->depth,&m2,NULL,NULL);
+ swf_ObjectPlace(i->tag,i->textid,getNewDepth(obj),&m2,NULL,NULL);
i->textid = -1;
}
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);
swf_ShapeSetEnd(i->tag);
swf_ShapeFree(s);
i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2);
- swf_ObjectPlace(i->tag,shapeid,++i->depth,0,0,0);
+ swf_ObjectPlace(i->tag,shapeid,getNewDepth(obj),0,0,0);
i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2);
- swf_ObjectPlaceClip(i->tag,shapeid,++i->depth,0,0,0,65535);
+ swf_ObjectPlaceClip(i->tag,shapeid,getNewDepth(obj),0,0,0,65535);
i->cliptag = i->tag;
}
msg("<trace> Placing shape id %d", i->shapeid);
i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
- swf_ObjectPlace(i->tag,i->shapeid,/*depth*/++i->depth,&i->page_matrix,NULL,NULL);
+ swf_ObjectPlace(i->tag,i->shapeid,getNewDepth(obj),&i->page_matrix,NULL,NULL);
swf_ShapeFree(i->shape);
i->shape = 0;
swf_DeleteTag(tag);
tag = prev;
}
+
+ if(i->overflow) {
+ wipeSWF(&i->swf);
+ }
}
SWF* swfoutput_get(struct swfoutput*obj)
if(y2) *y2 = i->swf.movieSize.ymax/20;
}
+void wipeSWF(SWF*swf)
+{
+ TAG*tag = swf->firstTag;
+ while(tag) {
+ TAG*next = tag->next;
+ if(tag->id != ST_SETBACKGROUNDCOLOR &&
+ tag->id != ST_END &&
+ tag->id != ST_SHOWFRAME) {
+ swf_DeleteTag(tag);
+ }
+ tag = next;
+ }
+}
+
int swfoutput_save(struct swfoutput* obj, char*filename)
{
swfoutput_internal*i = (swfoutput_internal*)obj->internal;
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");
m = i->page_matrix;
m.tx = p.x;
m.ty = p.y;
- swf_ObjectPlace(i->tag, buttonid, ++i->depth,&m,0,0);
+ swf_ObjectPlace(i->tag, buttonid, getNewDepth(obj),&m,0,0);
} else {
- swf_ObjectPlace(i->tag, buttonid, ++i->depth,&i->page_matrix,0,0);
+ swf_ObjectPlace(i->tag, buttonid, getNewDepth(obj),&i->page_matrix,0,0);
}
}
}
}
+/* 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;
}
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;
}
i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
CXFORM cxform2 = gfxcxform_to_cxform(cxform);
- swf_ObjectPlace(i->tag,myshapeid,/*depth*/++i->depth,&i->page_matrix,&cxform2,NULL);
+ swf_ObjectPlace(i->tag,myshapeid,getNewDepth(obj),&i->page_matrix,&cxform2,NULL);
}
void swf_startclip(gfxdevice_t*dev, gfxline_t*line)
i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
i->cliptags[i->clippos] = i->tag;
i->clipshapes[i->clippos] = myshapeid;
- i->clipdepths[i->clippos] = ++i->depth;
+ i->clipdepths[i->clippos] = getNewDepth(obj);
i->clippos++;
}
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)