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

sterling Thu May 18 02:39:00 2000 EDT Modified files: /php4/ext/swf swf.c config.m4 Log: Make the SWF module compile again + 1 stylistic change. Index: php4/ext/swf/swf.c diff -u php4/ext/swf/swf.c:1.9 php4/ext/swf/swf.c:1.10 --- php4/ext/swf/swf.c:1.9 Wed May 17 17:47:15 2000 +++ php4/ext/swf/swf.c Thu May 18 02:39:00 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: swf.c,v 1.9 2000/05/17 15:47:15 steinm Exp $ */ +/* $Id: swf.c,v 1.10 2000/05/18 00:39:00 sterling Exp $ */ #include "php.h" @@ -460,7 +460,6 @@ 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); @@ -505,17 +504,20 @@ } npoints = (*NumPoints)->value.lval; - for (i = 0; i < npoints; i++) { + for (i = 0; i < npoints; i++) + { if (zend_hash_index_find((*coordinates)->value.ht, (i * 2), (void **)&var) == SUCCESS) { SEPARATE_ZVAL(var); convert_to_double_ex(var); coords[i][0] = (float)(*var)->value.dval; } + if (zend_hash_index_find((*coordinates)->value.ht, (i * 2) + 1, (void **)&var) == SUCCESS) { SEPARATE_ZVAL(var); convert_to_double_ex(var); coords[i][1] = (float)(*var)->value.dval; } + } swf_definepoly((*obj_id)->value.lval, coords, npoints, (float)(*width)->value.dval); } Index: php4/ext/swf/config.m4 diff -u php4/ext/swf/config.m4:1.4 php4/ext/swf/config.m4:1.5 --- php4/ext/swf/config.m4:1.4 Wed May 17 17:47:15 2000 +++ php4/ext/swf/config.m4 Thu May 18 02:39:00 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.4 2000/05/17 15:47:15 steinm Exp $ +dnl $Id: config.m4,v 1.5 2000/05/18 00:39:00 sterling 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/lib/libswf.a; then + if test -r $i/libswf.a; then SWF_DIR=$i fi done @@ -21,7 +21,7 @@ AC_ADD_INCLUDE($SWF_DIR/include) PHP_SUBST(SWF_SHARED_LIBADD) - AC_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR/lib, SWF_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR, SWF_SHARED_LIBADD) AC_DEFINE(HAVE_SWF,1,[ ]) PHP_EXTENSION(swf, $ext_shared)