- fixed wrong interpretation of last parameter of swf_rotate()

- add MOD_COLOR and MOD_MATRIX constants

diff --git a/ext/swf/config.m4 b/ext/swf/config.m4
index da766d36e5348bed8bafaa4477028cfe5a5daeda..b02dcf26b6efa0e867121062e6f84ea4a91fcb37 100644 (file)
--- a/ext/swf/config.m4
+++ b/ext/swf/config.m4
@@ -9,7 +9,7 @@ PHP_ARG_WITH(swf, for libswf support,
 
 if test "$PHP_SWF" != "no"; then
   for i in /usr/local /usr $PHP_SWF; do
-    if test -r $i/libswf.a; then
+    if test -r $i/lib/libswf.a; then
       SWF_DIR=$i
     fi
   done
@@ -18,10 +18,10 @@ if test "$PHP_SWF" != "no"; then
     AC_MSG_ERROR(Please reinstall libswf.a - I cannot find libswf.a)
   fi
 
-  AC_ADD_INCLUDE($SWF_DIR)
+  AC_ADD_INCLUDE($SWF_DIR/include)
 
   PHP_SUBST(SWF_SHARED_LIBADD)
-  AC_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR, SWF_SHARED_LIBADD)
+  AC_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR/lib, SWF_SHARED_LIBADD)
   AC_DEFINE(HAVE_SWF,1,[ ])
 
   PHP_EXTENSION(swf, $ext_shared)

diff --git a/ext/swf/swf.c b/ext/swf/swf.c
index 5b01fb340b5874699d97ea75461f73309c9279be..ea6b7d919979a6f4b483689019b5e899d374bff1 100644 (file)
--- a/ext/swf/swf.c
+++ b/ext/swf/swf.c
@@ -121,6 +121,8 @@ PHP_MINFO_FUNCTION(swf)
 
 PHP_MINIT_FUNCTION(swf)
 {
+       REGISTER_LONG_CONSTANT("MOD_COLOR", MOD_COLOR, CONST_CS | CONST_PERSISTENT);
+       REGISTER_LONG_CONSTANT("MOD_MATRIX", MOD_MATRIX, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("TYPE_PUSHBUTTON", TYPE_PUSHBUTTON, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("TYPE_MENUBUTTON", TYPE_MENUBUTTON, CONST_CS | CONST_PERSISTENT);
        REGISTER_DOUBLE_CONSTANT("BSHitTest", BSHitTest, CONST_CS | CONST_PERSISTENT);
@@ -458,6 +460,7 @@ void php_swf_define(INTERNAL_FUNCTION_PARAMETERS, int opt)
        if (opt) {
                swf_defineline((*objid)->value.lval, (float)(*x1)->value.dval, (float)(*y1)->value.dval,
                               (float)(*x2)->value.dval, (float)(*y2)->value.dval, (float)(*width)->value.dval);
+                   (float)(*x2)->value.dval, (float)(*y2)->value.dval, (float)(*width)->value.dval);
        } else {
                swf_definerect((*objid)->value.lval, (float)(*x1)->value.dval, (float)(*y1)->value.dval,
                               (float)(*x2)->value.dval, (float)(*y2)->value.dval, (float)(*width)->value.dval);
@@ -1092,8 +1095,8 @@ PHP_FUNCTION(swf_rotate)
        }
        convert_to_double_ex(angle);
        convert_to_string_ex(axis);
-       
-       swf_rotate((*angle)->value.dval, (*axis)->value.str.val);
+
+       swf_rotate((*angle)->value.dval, (char)((*axis)->value.str.val)[0]);
 }
 /* }}} */