git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small adjustments
[swftools.git]
/
src
/
png2swf.c
diff --git
a/src/png2swf.c
b/src/png2swf.c
index
56ec1e4
..
8c1d6e6
100644
(file)
--- a/
src/png2swf.c
+++ b/
src/png2swf.c
@@
-163,7
+163,7
@@
int png_read_header(FILE*fi, struct png_header*header)
U8 head2[8];
U8*data;
fread(head2,8,1,fi);
U8 head2[8];
U8*data;
fread(head2,8,1,fi);
- if(strncmp(head,head2,4))
+ if(strncmp((char*)head,(char*)head2,4))
return 0;
while(png_read_chunk(&id, &len, &data, fi))
return 0;
while(png_read_chunk(&id, &len, &data, fi))
@@
-751,7
+751,14
@@
TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
int width=0, height=0;
int width=0, height=0;
+#ifndef HAVE_JPEGLIB
if(global.mkjpeg) {
if(global.mkjpeg) {
+ global.mkjpeg = 0;
+ msg("<warning> No jpeg support compiled in");
+ }
+#endif
+ if(global.mkjpeg) {
+#ifdef HAVE_JPEGLIB
RGBA*data = 0;
getPNG(sname, &width, &height, (unsigned char**)&data);
if(!data)
RGBA*data = 0;
getPNG(sname, &width, &height, (unsigned char**)&data);
if(!data)
@@
-765,6
+772,7
@@
TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
swf_SetU16(t, id);
swf_SetJPEGBits2(t, width,height,data,global.mkjpeg);
}
swf_SetU16(t, id);
swf_SetJPEGBits2(t, width,height,data,global.mkjpeg);
}
+#endif
} else if(1) {
RGBA*data = 0;
getPNG(sname, &width, &height, (unsigned char**)&data);
} else if(1) {
RGBA*data = 0;
getPNG(sname, &width, &height, (unsigned char**)&data);
@@
-784,8
+792,8
@@
TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
swf_GetMatrix(NULL, &m);
m.sx = (int)(20 * 0x10000);
m.sy = (int)(20 * 0x10000);
swf_GetMatrix(NULL, &m);
m.sx = (int)(20 * 0x10000);
m.sy = (int)(20 * 0x10000);
- m.tx = -10;
- m.ty = -10;
+ m.tx = 0;
+ m.ty = 0;
fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 1);
swf_SetU16(t, id + 1); // id
fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 1);
swf_SetU16(t, id + 1); // id
@@
-1072,7
+1080,7
@@
int main(int argc, char **argv)
global.framerate = 1.0;
global.verbose = 1;
global.framerate = 1.0;
global.verbose = 1;
- global.version = 6;
+ global.version = 8;
global.scale = 1.0;
processargs(argc, argv);
global.scale = 1.0;
processargs(argc, argv);