git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
840427b
)
added save method.
author
kramm
<kramm>
Thu, 21 Oct 2004 17:43:50 +0000
(17:43 +0000)
committer
kramm
<kramm>
Thu, 21 Oct 2004 17:43:50 +0000
(17:43 +0000)
pdf2swf/swfoutput.cc
patch
|
blob
|
history
pdf2swf/swfoutput.h
patch
|
blob
|
history
diff --git
a/pdf2swf/swfoutput.cc
b/pdf2swf/swfoutput.cc
index
9f91f98
..
1e79026
100644
(file)
--- a/
pdf2swf/swfoutput.cc
+++ b/
pdf2swf/swfoutput.cc
@@
-81,7
+81,6
@@
typedef struct _swfoutput_internal
char storefont;
int flag_protected;
char storefont;
int flag_protected;
- char* filename;
SWF swf;
TAG *tag;
int currentswfid;
SWF swf;
TAG *tag;
int currentswfid;
@@
-142,7
+141,6
@@
static swfoutput_internal* init_internal_struct()
i->storefont = 0;
i->flag_protected = 0;
i->storefont = 0;
i->flag_protected = 0;
- i->filename = 0;
i->currentswfid = 0;
i->depth = 1;
i->startdepth = 1;
i->currentswfid = 0;
i->depth = 1;
i->startdepth = 1;
@@
-1498,7
+1496,7
@@
void swfoutput_newpage(struct swfoutput*obj, int pageNum, int x1, int y1, int x2
}
/* initialize the swf writer */
}
/* initialize the swf writer */
-void swfoutput_init(struct swfoutput* obj, char*_filename)
+void swfoutput_init(struct swfoutput* obj)
{
memset(obj, 0, sizeof(struct swfoutput));
obj->internal = init_internal_struct();
{
memset(obj, 0, sizeof(struct swfoutput));
obj->internal = init_internal_struct();
@@
-1507,7
+1505,6
@@
void swfoutput_init(struct swfoutput* obj, char*_filename)
SRECT r;
RGBA rgb;
SRECT r;
RGBA rgb;
- i->filename = _filename;
msg("<verbose> initializing swf output for size %d*%d\n", i->sizex,i->sizey);
msg("<verbose> initializing swf output for size %d*%d\n", i->sizex,i->sizey);
@@
-1699,7
+1696,7
@@
static void endshape(swfoutput*obj, int clipdepth)
i->bboxrectpos = -1;
}
i->bboxrectpos = -1;
}
-void swfoutput_save(struct swfoutput* obj)
+void swfoutput_save(struct swfoutput* obj, char*filename)
{
swfoutput_internal*i = (swfoutput_internal*)obj->internal;
endpage(obj);
{
swfoutput_internal*i = (swfoutput_internal*)obj->internal;
endpage(obj);
@@
-1717,15
+1714,13
@@
void swfoutput_save(struct swfoutput* obj)
}
int fi;
}
int fi;
- if(!i->filename)
- return;
- if(i->filename)
- fi = open(i->filename, O_BINARY|O_CREAT|O_TRUNC|O_WRONLY, 0777);
+ if(filename)
+ fi = open(filename, O_BINARY|O_CREAT|O_TRUNC|O_WRONLY, 0777);
else
fi = 1; // stdout
if(fi<=0) {
else
fi = 1; // stdout
if(fi<=0) {
- msg("<fatal> Could not create \"%s\". ", FIXNULL(i->filename));
+ msg("<fatal> Could not create \"%s\". ", FIXNULL(filename));
exit(1);
}
exit(1);
}
@@
-1739,7
+1734,7
@@
void swfoutput_save(struct swfoutput* obj)
msg("<error> WriteSWF() failed.\n");
}
msg("<error> WriteSWF() failed.\n");
}
- if(i->filename)
+ if(filename)
close(fi);
msg("<notice> SWF written\n");
}
close(fi);
msg("<notice> SWF written\n");
}
@@
-1749,8
+1744,6
@@
void swfoutput_destroy(struct swfoutput* obj)
{
swfoutput_internal*i = (swfoutput_internal*)obj->internal;
{
swfoutput_internal*i = (swfoutput_internal*)obj->internal;
- swfoutput_save(obj);
-
fontlist_t *tmp,*iterator = i->fontlist;
while(iterator) {
if(iterator->swffont) {
fontlist_t *tmp,*iterator = i->fontlist;
while(iterator) {
if(iterator->swffont) {
diff --git
a/pdf2swf/swfoutput.h
b/pdf2swf/swfoutput.h
index
16ef48f
..
298e456
100644
(file)
--- a/
pdf2swf/swfoutput.h
+++ b/
pdf2swf/swfoutput.h
@@
-44,6
+44,7
@@
struct swfoutput
RGBA strokergb;
RGBA fillrgb;
int drawmode;
RGBA strokergb;
RGBA fillrgb;
int drawmode;
+ void*internal;
};
/* outline definition, adapted from t1lib.h */
};
/* outline definition, adapted from t1lib.h */
@@
-93,13
+94,11
@@
typedef SWF_PATHSEGMENT SWF_OUTLINE;
#define DRAWMODE_CLIP 4
#define DRAWMODE_EOCLIP 5
#define DRAWMODE_CLIP 4
#define DRAWMODE_EOCLIP 5
-void swfoutput_init(struct swfoutput*, char*filename);
void swfoutput_setparameter(char*name, char*value);
void swfoutput_setparameter(char*name, char*value);
-void swfoutput_setprotected(); //write PROTECT tag
-
+void swfoutput_init(struct swfoutput*);
+void swfoutput_save(struct swfoutput*, char*filename);
void swfoutput_newpage(struct swfoutput*, int pageNum, int x1, int y1, int x2, int y2);
void swfoutput_newpage(struct swfoutput*, int pageNum, int x1, int y1, int x2, int y2);
-
void swfoutput_setfont(struct swfoutput*, char*fontid, char*filename);
int swfoutput_queryfont(struct swfoutput*, char*fontid);
int getCharID(SWFFONT *font, int charnr, char *charname, int u);
void swfoutput_setfont(struct swfoutput*, char*fontid, char*filename);
int swfoutput_queryfont(struct swfoutput*, char*fontid);
int getCharID(SWFFONT *font, int charnr, char *charname, int u);