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 (parent:
8471a5f
)
png2swf: don't assume we have jpeg support
author
Matthias Kramm
<kramm@quiss.org>
Wed, 1 Apr 2009 18:34:57 +0000
(20:34 +0200)
committer
Matthias Kramm
<kramm@quiss.org>
Wed, 1 Apr 2009 18:34:57 +0000
(20:34 +0200)
src/png2swf.c
patch
|
blob
|
history
diff --git
a/src/png2swf.c
b/src/png2swf.c
index
56ec1e4
..
9afdc46
100644
(file)
--- a/
src/png2swf.c
+++ b/
src/png2swf.c
@@
-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);