gfxsource now has object-oriented members

[swftools.git] / lib / swf / swf.c

diff --git a/lib/swf/swf.c b/lib/swf/swf.c
index 267beee..0540e0f 100644 (file)
--- a/lib/swf/swf.c
+++ b/lib/swf/swf.c
@@ -365,10 +365,10 @@ static void renderFilled(render_t*r, gfxline_t*line, FILLSTYLE*f, CXFORM*cx)
 RGBA swf_ColorTransform(RGBA*color, CXFORM*cx)
 {
     RGBA dest;
-    dest.r = (cx->r0*dest.r + cx->r1*256) >> 8;
-    dest.g = (cx->g0*dest.g + cx->g1*256) >> 8;
-    dest.b = (cx->b0*dest.b + cx->b1*256) >> 8;
-    dest.a = (cx->a0*dest.a + cx->a1*256) >> 8;
+    dest.r = (cx->r0*color->r + cx->r1*256) >> 8;
+    dest.g = (cx->g0*color->g + cx->g1*256) >> 8;
+    dest.b = (cx->b0*color->b + cx->b1*256) >> 8;
+    dest.a = (cx->a0*color->a + cx->a1*256) >> 8;
     return dest;
 }
 
@@ -509,12 +509,12 @@ gfxpage_t* swf_doc_getpage(gfxdocument_t*doc, int page)
     return swf_page;
 }
 
-void swf_set_parameter(char*name, char*value)
+void swf_set_parameter(gfxsource_t*src, char*name, char*value)
 {
     msg("<verbose> setting parameter %s to \"%s\"", name, value);
 }
 
-gfxdocument_t*swf_open(char*filename)
+gfxdocument_t*swf_open(gfxsource_t*src, char*filename)
 {
     gfxdocument_t*swf_doc = (gfxdocument_t*)malloc(sizeof(gfxdocument_t));
     memset(swf_doc, 0, sizeof(gfxdocument_t));