Re: cvs: php-src /ext/ming ming.c
From: Andi Gutmans Date: Wed, 10 Aug 2005 03:17:28 +0000 Subject: Re: cvs: php-src /ext/ming ming.c References: 1 Groups: php.internals Request: Send a blank email to internals+get-17767@lists.php.net to get a copy of this message
OK thanks. At 08:05 PM 8/9/2005 -0700, Frank M. Kromann wrote:Hi Andi, I'll make it work with both versions tonight. If I can't get that to work I'll revert the latest fix so we can release. - Frank Guys, Any idea when you'll resolve this issue? I'd like to roll tomorrow or the day after. Thanks, Andi At 09:12 PM 8/9/2005 +0200, Marcus Boerger wrote:Hello Frank, this broke my build again. Before i was able to support 02a,0.3beta1 (thelatest according to the web) and with/without the zlib support. Nowhere ismy error: /usr/src/php-cvs/ext/ming/ming.c: In function `zif_ming_useConstants': /usr/src/php-cvs/ext/ming/ming.c:140: warning: implicit declaration offunction `Ming_useConstants' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfbitmap___construct':/usr/src/php-cvs/ext/ming/ming.c:386: warning: assignment from incompatible pointer type /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfdisplayitem_endMask':/usr/src/php-cvs/ext/ming/ming.c:1060: warning: implicit declaration offunction `SWFDisplayItem_endMask' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfdisplayitem_getX':/usr/src/php-cvs/ext/ming/ming.c:1074: warning: implicit declaration offunction `SWFDisplayItem_get_x' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfdisplayitem_getY':/usr/src/php-cvs/ext/ming/ming.c:1089: warning: implicit declaration offunction `SWFDisplayItem_get_y' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfdisplayitem_getXScale':/usr/src/php-cvs/ext/ming/ming.c:1104: warning: implicit declaration offunction `SWFDisplayItem_get_xScale' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfdisplayitem_getYScale':/usr/src/php-cvs/ext/ming/ming.c:1119: warning: implicit declaration offunction `SWFDisplayItem_get_yScale' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfdisplayitem_getXSkew':/usr/src/php-cvs/ext/ming/ming.c:1134: warning: implicit declaration offunction `SWFDisplayItem_get_xSkew' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfdisplayitem_getYSkew':/usr/src/php-cvs/ext/ming/ming.c:1149: warning: implicit declaration offunction `SWFDisplayItem_get_ySkew' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfdisplayitem_getRot':/usr/src/php-cvs/ext/ming/ming.c:1164: warning: implicit declaration offunction `SWFDisplayItem_get_rot' /usr/src/php-cvs/ext/ming/ming.c: In function `destroy_SWFVideoStream_resource': /usr/src/php-cvs/ext/ming/ming.c:1951: warning: implicit declaration offunction `destroySWFVideoStream' /usr/src/php-cvs/ext/ming/ming.c: In function `zif_swfmovie_output': /usr/src/php-cvs/ext/ming/ming.c:2241: warning: implicit declaration offunction `Ming_setSWFCompression' /usr/src/php-cvs/ext/ming/ming.c:2242: error: too few arguments to function `SWFMovie_output' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfmovie_saveToFile':/usr/src/php-cvs/ext/ming/ming.c:2299: error: too few arguments to function `SWFMovie_output' /usr/src/php-cvs/ext/ming/ming.c:2272: warning: unused variable`movie'/usr/src/php-cvs/ext/ming/ming.c: In function `zif_swfmovie_save': /usr/src/php-cvs/ext/ming/ming.c:2348: error: too few arguments to function `SWFMovie_output' /usr/src/php-cvs/ext/ming/ming.c:2363: error: too few arguments to function `SWFMovie_output' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swfmovie_writeExports':/usr/src/php-cvs/ext/ming/ming.c:2495: warning: implicit declaration offunction `SWFMovie_writeExports' /usr/src/php-cvs/ext/ming/ming.c: In function`zif_swftextfield_setFont':/usr/src/php-cvs/ext/ming/ming.c:3704: warning: passing arg 2 of `SWFTextField_setFont' from incompatible pointer type make: *** [ext/ming/ming.lo] Error 1 marcus@zaphod /usr/src/php-cvs $ rpm -qa|grep ming ming-utils-0.3-0.beta1.8mdk libming0-0.3-0.beta1.8mdk libming0-devel-0.3-0.beta1.8mdk php5-ming-5.1.0.dev-19 What was your problem? best regards marcus Saturday, August 6, 2005, 7:30:19 AM, you wrote:fmk Sat Aug 6 01:30:19 2005 EDTModified files:/php-src/ext/ming ming.cLog: Cleanup to match the current cvs version of ming0.3betahttp://cvs.php.net/diff.php/php-src/ext/ming/ming.c?r1=1.78&r2=1.79&ty=u+----------------------------------------------------------------------+Index: php-src/ext/ming/ming.c diff -u php-src/ext/ming/ming.c:1.78 php-src/ext/ming/ming.c:1.79--- php-src/ext/ming/ming.c:1.78 Wed Aug 3 10:07:26 2005 +++ php-src/ext/ming/ming.c Sat Aug 6 01:30:17 2005@@ -17,7 +17,7 @@{*/-/* $Id: ming.c,v 1.78 2005/08/03 14:07:26 sniper Exp $ */ +/* $Id: ming.c,v 1.79 2005/08/06 05:30:17 fmk Exp $ */#ifdef HAVE_CONFIG_H #include "config.h" @@ -2218,7 +2218,7 @@ PHP_METHOD(swfmovie, output) {SWFMovie movie = getMovie(getThis() TSRMLS_CC);-#if defined(HAVE_MING_ZLIB) && !defined(HAVE_NEW_MING) +#if defined(HAVE_MING_ZLIB) && defined(HAVE_NEW_MING)zval **zlimit = NULL; int limit = -1; int argc = ZEND_NUM_ARGS();@@ -2244,25 +2244,6 @@Ming_setSWFCompression(oldval); } RETURN_LONG(out);-#elif defined(HAVE_NEW_MING)- zval **zlimit = NULL; - int limit = -1; - int argc = ZEND_NUM_ARGS();-- if(argc) { - if (zend_get_parameters_ex(1, &zlimit) == FAILURE)be- WRONG_PARAM_COUNT; - }-- convert_to_long_ex(zlimit); - limit = Z_LVAL_PP(zlimit);-- if ((limit < 0) || (limit > 9)) { - php_error(E_WARNING,"compression level mustwithin 0..9");NULL,- RETURN_FALSE; - } - } - RETURN_LONG(SWFMovie_output(movie, &phpByteOutputMethod,limit));NULL));#elseRETURN_LONG(SWFMovie_output(movie, &phpByteOutputMethod,FAILURE)#endif @@ -2282,11 +2263,9 @@ PHP_METHOD(swfmovie, saveToFile) {zval **x;-#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING) +#if defined(HAVE_MING_ZLIB) && defined(HAVE_NEW_MING)zval **zlimit = NULL; int limit = -1;-#endif -#if defined(HAVE_MING_ZLIB) && !defined(HAVE_NEW_MING)int oldval = INT_MIN; long out;#endif @@ -2299,7 +2278,7 @@WRONG_PARAM_COUNT; break; case 2:-#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING) +#if defined(HAVE_MING_ZLIB) && defined(HAVE_NEW_MING)if (zend_get_parameters_ex(2, &x, &zlimit) ==beWRONG_PARAM_COUNT; convert_to_long_ex(zlimit);@@ -2308,8 +2287,6 @@php_error(E_WARNING,"compression level mustwithin 0..9");what));RETURN_FALSE; }-#endif -#if defined(HAVE_MING_ZLIB) && !defined(HAVE_NEW_MING)oldval = Ming_setSWFCompression(limit);#endifbreak;@@ -2318,13 +2295,11 @@}&phpStreamOutputMethod, what);ZEND_FETCH_RESOURCE(what, php_stream *, x,-1,"File-Handle",php_file_le_stream()); -#if defined(HAVE_MING_ZLIB) && !defined(HAVE_NEW_MING) +#if defined(HAVE_MING_ZLIB) && defined(HAVE_NEW_MING)out = SWFMovie_output(getMovie(getThis() TSRMLS_CC),what, limit));if (oldval >= -1 && oldval <=9) Ming_setSWFCompression(oldval); RETURN_LONG(out);-#elif defined(HAVE_NEW_MING)- RETURN_LONG(SWFMovie_output(movie, &phpStreamOutputMethod,#elseRETURN_LONG(SWFMovie_output(movie, &phpStreamOutputMethod,FAILURE) {#endif @@ -2336,11 +2311,9 @@ PHP_METHOD(swfmovie, save) {zval **x;-#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING) +#if defined(HAVE_MING_ZLIB) && defined(HAVE_NEW_MING)zval **zlimit = NULL; int limit = -1;-#endif -#if defined(HAVE_MING_ZLIB) && !defined(HAVE_NEW_MING)int oldval = INT_MIN;#endiflong retval;@@ -2353,7 +2326,7 @@} break; case 2:-#if defined(HAVE_MING_ZLIB) || defined(HAVE_NEW_MING) +#if defined(HAVE_MING_ZLIB) && defined(HAVE_NEW_MING)if (zend_get_parameters_ex(2, &x, &zlimit) ==beWRONG_PARAM_COUNT; }@@ -2363,8 +2336,6 @@php_error(E_WARNING,"compression level mustwithin 0..9");RETURN_FALSE; }-#endif -#if defined(HAVE_MING_ZLIB) && !defined(HAVE_NEW_MING)oldval = Ming_setSWFCompression(limit);#endifbreak;@@ -2374,16 +2345,12 @@if (Z_TYPE_PP(x) == IS_RESOURCE) { ZEND_FETCH_RESOURCE(stream, php_stream *, x,-1,"File-Handle",php_file_le_stream()); -#if defined(HAVE_NEW_MING)- RETURN_LONG(SWFMovie_output(getMovie(getThis()TSRMLS_CC), &phpStreamOutputMethod, stream, limit)); -#elseRETVAL_LONG(SWFMovie_output(getMovie(getThis()TSRMLS_CC), &phpStreamOutputMethod, stream)); -#if defined(HAVE_MING_ZLIB) && !defined(HAVE_NEW_MING) +#if defined(HAVE_MING_ZLIB) && defined(HAVE_NEW_MING)if(oldval >= -1 && oldval <=9) Ming_setSWFCompression(oldval);#endifreturn;-#endif}convert_to_string_ex(x);@@ -2393,13 +2360,9 @@RETURN_FALSE; }-#if defined(HAVE_NEW_MING)Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php- retval = SWFMovie_output(getMovie(getThis() TSRMLS_CC),&phpStreamOutputMethod, (void *)stream, limit); -#elseretval = SWFMovie_output(getMovie(getThis() TSRMLS_CC),&phpStreamOutputMethod, (void *)stream); -#endifphp_stream_close(stream);-#if defined(HAVE_MING_ZLIB) && !defined(HAVE_NEW_MING) +#if defined(HAVE_MING_ZLIB) && defined(HAVE_NEW_MING)if(oldval >= -1 && oldval <=9) Ming_setSWFCompression(oldval);#endif
Thread (3 messages)
| « previous | php.internals (#17767) | next » |
|---|