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:
f18c3f2
)
stubs for setjpegbits2/setjpegbits3 if no jpeglib compiled in
author
kramm
<kramm>
Mon, 6 Oct 2008 12:55:19 +0000
(12:55 +0000)
committer
kramm
<kramm>
Mon, 6 Oct 2008 12:55:19 +0000
(12:55 +0000)
lib/modules/swfbits.c
patch
|
blob
|
history
diff --git
a/lib/modules/swfbits.c
b/lib/modules/swfbits.c
index
220fff4
..
0749e0b
100644
(file)
--- a/
lib/modules/swfbits.c
+++ b/
lib/modules/swfbits.c
@@
-299,8
+299,8
@@
int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits)
return 0;
}
return 0;
}
-void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap,
- int quality)
+#if defined(HAVE_JPEGLIB)
+void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality)
{
JPEGBITS *jpeg;
int y;
{
JPEGBITS *jpeg;
int y;
@@
-318,6
+318,13
@@
void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap,
rfx_free(scanline);
swf_SetJPEGBitsFinish(jpeg);
}
rfx_free(scanline);
swf_SetJPEGBitsFinish(jpeg);
}
+#else
+void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality)
+{
+ fprintf(stderr, "Error: swftools compiled without jpeglib\n");
+ return -1;
+}
+#endif
void swf_GetJPEGSize(char *fname, int *width, int *height)
{
void swf_GetJPEGSize(char *fname, int *width, int *height)
{
@@
-1158,6
+1165,15
@@
int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int qualit
return 0;
}
return 0;
}
+#else
+int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality)
+{
+ fprintf(stderr, "Error: swftools compiled without jpeglib\n");
+ return -1;
+}
+#endif
+
+
/* expects mem to be non-premultiplied */
TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quality)
{
/* expects mem to be non-premultiplied */
TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quality)
{
@@
-1196,8
+1212,6
@@
TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quali
return tag;
}
return tag;
}
-#endif
-
RGBA *swf_ExtractImage(TAG * tag, int *dwidth, int *dheight)
{
RGBA *img;
RGBA *swf_ExtractImage(TAG * tag, int *dwidth, int *dheight)
{
RGBA *img;