cvs: php4 /ext/swf/ config.m4 swf.c

steinm Wed May 17 17:47:15 2000 EDT Modified files: /php4/ext/swf config.m4 swf.c Log: - fixed wrong interpretation of last parameter of swf_rotate() - add MOD_COLOR and MOD_MATRIX constants Index: php4/ext/swf/config.m4 diff -u php4/ext/swf/config.m4:1.3 php4/ext/swf/config.m4:1.4 --- php4/ext/swf/config.m4:1.3 Tue May 2 06:01:15 2000 +++ php4/ext/swf/config.m4 Wed May 17 17:47:15 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2000/05/02 04:01:15 sas Exp $ +dnl $Id: config.m4,v 1.4 2000/05/17 15:47:15 steinm Exp $ dnl config.m4 for extension libswf dnl don't forget to call PHP_EXTENSION(swf) dnl This file is a modified version of config.m4 @@ -9,7 +9,7 @@ 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 @@ 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) Index: php4/ext/swf/swf.c diff -u php4/ext/swf/swf.c:1.8 php4/ext/swf/swf.c:1.9 --- php4/ext/swf/swf.c:1.8 Tue May 16 09:54:10 2000 +++ php4/ext/swf/swf.c Wed May 17 17:47:15 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: swf.c,v 1.8 2000/05/16 07:54:10 steinm Exp $ */ +/* $Id: swf.c,v 1.9 2000/05/17 15:47:15 steinm Exp $ */ #include "php.h" @@ -121,6 +121,8 @@ 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 @@ 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 @@ } 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]); } /* }}} */