Browse Source

Make the SWF module compile again + 1 stylistic change.

PHP-4.0.5
Sterling Hughes 27 years ago
parent
commit
a8bb2a86b1
  1. 4
      ext/swf/config.m4
  2. 6
      ext/swf/swf.c

4
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/lib/libswf.a; then
if test -r $i/libswf.a; then
SWF_DIR=$i
fi
done
@ -21,7 +21,7 @@ if test "$PHP_SWF" != "no"; then
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)

6
ext/swf/swf.c

@ -460,7 +460,6 @@ 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);
@ -505,17 +504,20 @@ PHP_FUNCTION(swf_definepoly)
}
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);
}

Loading…
Cancel
Save