git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed font layout code (again)
[swftools.git]
/
src
/
swfextract.c
diff --git
a/src/swfextract.c
b/src/swfextract.c
index
965cfd3
..
312d9da
100644
(file)
--- a/
src/swfextract.c
+++ b/
src/swfextract.c
@@
-48,6
+48,7
@@
char* extractname = 0;
char hollow = 0;
char originalplaceobjects = 0;
char hollow = 0;
char originalplaceobjects = 0;
+char movetozero = 0;
int numextracts = 0;
int numextracts = 0;
@@
-60,6
+61,7
@@
struct options_t options[] =
{"j","jpegs"},
{"p","pngs"},
{"P","placeobject"},
{"j","jpegs"},
{"p","pngs"},
{"P","placeobject"},
+ {"0","movetozero"},
{"m","mp3"},
{"s","sound"},
{"n","name"},
{"m","mp3"},
{"s","sound"},
{"n","name"},
@@
-154,6
+156,10
@@
int args_callback_option(char*name,char*val)
originalplaceobjects = 1;
return 0;
}
originalplaceobjects = 1;
return 0;
}
+ else if(!strcmp(name, "0")) {
+ movetozero = 1;
+ return 0;
+ }
else if(!strcmp(name, "w")) {
hollow = 1;
return 0;
else if(!strcmp(name, "w")) {
hollow = 1;
return 0;
@@
-254,6
+260,18
@@
void enumerateIDs(TAG*tag, void(*callback)(void*))
callback(&tag->data[ptr[t]]);
}
callback(&tag->data[ptr[t]]);
}
+void moveToZero(TAG*tag)
+{
+ if(!swf_isPlaceTag(tag))
+ return;
+ SWFPLACEOBJECT obj;
+ swf_GetPlaceObject(tag, &obj);
+ obj.matrix.tx = 0;
+ obj.matrix.ty = 0;
+ swf_ResetTag(tag, tag->id);
+ swf_SetPlaceObject(tag, &obj);
+}
+
void extractTag(SWF*swf, char*filename)
{
SWF newswf;
void extractTag(SWF*swf, char*filename)
{
SWF newswf;
@@
-271,6
+289,12
@@
void extractTag(SWF*swf, char*filename)
newswf.fileVersion = swf->fileVersion;
newswf.frameRate = swf->frameRate;
newswf.movieSize = swf->movieSize;
newswf.fileVersion = swf->fileVersion;
newswf.frameRate = swf->frameRate;
newswf.movieSize = swf->movieSize;
+ if(movetozero && originalplaceobjects) {
+ newswf.movieSize.xmax = swf->movieSize.xmax - swf->movieSize.xmin;
+ newswf.movieSize.ymax = swf->movieSize.ymax - swf->movieSize.ymin;
+ newswf.movieSize.xmin = 0;
+ newswf.movieSize.ymin = 0;
+ }
newswf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
desttag = newswf.firstTag;
newswf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
desttag = newswf.firstTag;
@@
-316,6
+340,8
@@
void extractTag(SWF*swf, char*filename)
}
if(srctag->id == ST_DEFINESPRITE)
sprite = 1;
}
if(srctag->id == ST_DEFINESPRITE)
sprite = 1;
+ if(srctag->id == ST_JPEGTABLES)
+ copy = 1;
if(swf_isDefiningTag(srctag)) {
int id = swf_GetDefineID(srctag);
if(used[id]) {
if(swf_isDefiningTag(srctag)) {
int id = swf_GetDefineID(srctag);
if(used[id]) {
@@
-325,7
+351,7
@@
void extractTag(SWF*swf, char*filename)
swf_ExpandRect2(&objectbbox, &b);
}
} else
swf_ExpandRect2(&objectbbox, &b);
}
} else
- if (((((srctag->id == ST_PLACEOBJECT || srctag->id == ST_PLACEOBJECT2) && originalplaceobjects)
+ if ((((swf_isPlaceTag(srctag) && originalplaceobjects)
|| srctag->id == ST_STARTSOUND) && (used[swf_GetPlaceID(srctag)]&4) ) ||
(swf_isPseudoDefiningTag(srctag) && used[swf_GetDefineID(srctag)]) ||
(tagused[tagnum]))
|| srctag->id == ST_STARTSOUND) && (used[swf_GetPlaceID(srctag)]&4) ) ||
(swf_isPseudoDefiningTag(srctag) && used[swf_GetDefineID(srctag)]) ||
(tagused[tagnum]))
@@
-345,6
+371,9
@@
void extractTag(SWF*swf, char*filename)
desttag->len = desttag->memsize = srctag->len;
desttag->data = malloc(srctag->len);
memcpy(desttag->data, srctag->data, srctag->len);
desttag->len = desttag->memsize = srctag->len;
desttag->data = malloc(srctag->len);
memcpy(desttag->data, srctag->data, srctag->len);
+ if(movetozero && swf_isPlaceTag(desttag)) {
+ moveToZero(desttag);
+ }
if(reset)
copy = 0;
}
if(reset)
copy = 0;
}
@@
-356,20
+385,25
@@
void extractTag(SWF*swf, char*filename)
if(!originalplaceobjects && (extractids||extractname_id>=0)) {
int number = 0;
int id = 0;
if(!originalplaceobjects && (extractids||extractname_id>=0)) {
int number = 0;
int id = 0;
+ int t;
TAG* objtag = 0;
SRECT bbox;
memset(&bbox, 0, sizeof(SRECT));
TAG* objtag = 0;
SRECT bbox;
memset(&bbox, 0, sizeof(SRECT));
- for(t=0;t<65536;t++) {
- if(is_in_range(t, extractids)) {
- id = t;
- number++;
- }
- }
- if(number>=2)
+ if(extractids) {
+ for(t=0;t<65536;t++) {
+ if(is_in_range(t, extractids)) {
+ id = t;
+ number++;
+ }
+ }
+ }
+ if(number>=2) {
printf("warning! You should use the -P when extracting multiple objects\n");
printf("warning! You should use the -P when extracting multiple objects\n");
+ }
+
if(number == 1) {
/* if there is only one object, we will scale it.
if(number == 1) {
/* if there is only one object, we will scale it.
- So let's figure out it's bounding box */
+ So let's figure out its bounding box */
TAG*tag = swf->firstTag;
while(tag) {
if(swf_isDefiningTag(tag) && tag->id != ST_DEFINESPRITE) {
TAG*tag = swf->firstTag;
while(tag) {
if(swf_isDefiningTag(tag) && tag->id != ST_DEFINESPRITE) {
@@
-379,11
+413,15
@@
void extractTag(SWF*swf, char*filename)
}
tag = tag->next;
}
}
tag = tag->next;
}
- }
+ newswf.movieSize.xmin = 0;
+ newswf.movieSize.ymin = 0;
+ newswf.movieSize.xmax = 512*20;
+ newswf.movieSize.ymax = 512*20;
+ } else {
+ if((objectbbox.xmin|objectbbox.ymin|objectbbox.xmax|objectbbox.ymax)!=0)
+ newswf.movieSize = objectbbox;
+ }
- int t;
- if((objectbbox.xmin|objectbbox.ymin|objectbbox.xmax|objectbbox.ymax)!=0)
- newswf.movieSize = objectbbox;
if(extractname_id>=0) {
desttag = swf_InsertTag(desttag, ST_PLACEOBJECT2);
swf_ObjectPlace(desttag, extractname_id, extractname_id, 0,0,extractname);
if(extractname_id>=0) {
desttag = swf_InsertTag(desttag, ST_PLACEOBJECT2);
swf_ObjectPlace(desttag, extractname_id, extractname_id, 0,0,extractname);
@@
-403,7
+441,7
@@
void extractTag(SWF*swf, char*filename)
m.sx = (512*20*65536)/max;
m.sy = (512*20*65536)/max;
}
m.sx = (512*20*65536)/max;
m.sy = (512*20*65536)/max;
}
- newswf.movieSize = swf_TurnRect(newswf.movieSize, &m);
+ //newswf.movieSize = swf_TurnRect(newswf.movieSize, &m);
}
swf_ObjectPlace(desttag, t, t, &m,0,0);
}
}
swf_ObjectPlace(desttag, t, t, &m,0,0);
}
@@
-718,11
+756,11
@@
void handlelossless(TAG*tag)
U8 bpp = 1;
U8 format;
U8 tmp;
U8 bpp = 1;
U8 format;
U8 tmp;
- U8* data=0;
+ Bytef* data=0;
U8* data2=0;
U8* data3=0;
U8* data2=0;
U8* data3=0;
- U32 datalen;
- U32 datalen2;
+ uLongf datalen;
+ uLongf datalen2;
U32 datalen3;
U8 head[] = {137,80,78,71,13,10,26,10};
int cols;
U32 datalen3;
U8 head[] = {137,80,78,71,13,10,26,10};
int cols;
@@
-830,12
+868,21
@@
void handlelossless(TAG*tag)
png_write_byte(fi,palette[t].b);
}
png_end_chunk(fi);
png_write_byte(fi,palette[t].b);
}
png_end_chunk(fi);
+
+ if(alpha) {
+ /* write alpha palette */
+ png_start_chunk(fi, "tRNS", 256);
+ for(t=0;t<256;t++) {
+ png_write_byte(fi,palette[t].a);
+ }
+ png_end_chunk(fi);
+ }
}
{
int pos2 = 0;
int x,y;
int srcwidth = width * (bpp/8);
}
{
int pos2 = 0;
int x,y;
int srcwidth = width * (bpp/8);
- datalen3 = width*height*4;
+ datalen3 = (width*4+5)*height;
data3 = (U8*)malloc(datalen3);
for(y=0;y<height;y++)
{
data3 = (U8*)malloc(datalen3);
for(y=0;y<height;y++)
{
@@
-983,6
+1030,11
@@
int main (int argc,char ** argv)
&& !extractmp3 && !extractsoundids && !extractfontids)
listavailable = 1;
&& !extractmp3 && !extractsoundids && !extractfontids)
listavailable = 1;
+ if(!originalplaceobjects && movetozero) {
+ fprintf(stderr, "Error: -0 (--movetozero) can only be used in conjunction with -P (--placeobject)\n");
+ return 0;
+ }
+
if(!filename)
{
fprintf(stderr, "You must supply a filename.\n");
if(!filename)
{
fprintf(stderr, "You must supply a filename.\n");
@@
-1090,13
+1142,15
@@
int main (int argc,char ** argv)
maing = tag->data[1];
mainb = tag->data[2];
}
maing = tag->data[1];
mainb = tag->data[2];
}
- else if(tag->id == ST_PLACEOBJECT2) {
+ else if(swf_isPlaceTag(tag) && tag->id != ST_PLACEOBJECT ) {
char*name = swf_GetName(tag);
if(name && extractname && !strcmp(name, extractname)) {
int id = swf_GetPlaceID(tag);
used[id] = 5;
found = 1;
char*name = swf_GetName(tag);
if(name && extractname && !strcmp(name, extractname)) {
int id = swf_GetPlaceID(tag);
used[id] = 5;
found = 1;
- tagused[tagnum] = 1;
+ if(originalplaceobjects) {
+ tagused[tagnum] = 1;
+ }
depths[swf_GetDepth(tag)] = 1;
extractname_id = id;
}
depths[swf_GetDepth(tag)] = 1;
extractname_id = id;
}