fmk Thu Jul 24 18:39:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ming ming.c
Log:
Fix parameter types for a couple of methods
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.8.2.7&r2=1.79.2.4.2.8.2.8&diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.79.2.4.2.8.2.7
php-src/ext/ming/ming.c:1.79.2.4.2.8.2.8
--- php-src/ext/ming/ming.c:1.79.2.4.2.8.2.7 Thu Jul 24 08:22:47 2008
+++ php-src/ext/ming/ming.c Thu Jul 24 18:39:41 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ming.c,v 1.79.2.4.2.8.2.7 2008/07/24 08:22:47 fmk Exp $ */
+/* $Id: ming.c,v 1.79.2.4.2.8.2.8 2008/07/24 18:39:41 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -43,7 +43,7 @@
void destroySWFBlock(SWFBlock block);
#endif
-static const zend_function_entry ming_functions[] = {
+static zend_function_entry ming_functions[] = {
PHP_FALIAS(ming_setcubicthreshold, ming_setCubicThreshold, NULL)
PHP_FALIAS(ming_setscale, ming_setScale, NULL)
PHP_FALIAS(ming_useswfversion, ming_useSWFVersion, NULL)
@@ -2595,7 +2595,7 @@
SWFBlur blur;
int ret;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ddd", &blurX,
&blurY, &passes) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ddl", &blurX,
&blurY, &passes) == FAILURE) {
return;
}
@@ -3452,6 +3452,8 @@
case 0:
stream = newSWFVideoStream();
break;
+ default: // warn
+ return;
}
if(stream) {
@@ -3910,7 +3912,6 @@
PHP_METHOD(swfmovie, saveToFile)
{
zval *x;
- long zlimit = 0;
int limit = -1;
#if !defined(HAVE_NEW_MING)
int oldval = INT_MIN;
@@ -3949,7 +3950,7 @@
Saves the movie. 'where' can be stream and the movie will be saved there
otherwise it is treated as string and written in file with that name */
PHP_METHOD(swfmovie, save)
{
- zval *x, *zlimit = NULL;
+ zval *x;
int limit = -1;
#if !defined(HAVE_NEW_MING)
int oldval = INT_MIN;
@@ -5182,7 +5183,7 @@
SWFInput input = NULL;
SWFMovieClip mc = getSprite(getThis() TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zdd", &zfile,
&rate, &skip) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zd|d", &zfile,
&rate, &skip) == FAILURE) {
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
