Re: cvs: php-src(PHP_5_1) /ext/ming ming.c

From:	Andi Gutmans	Date:	Thu, 11 Aug 2005 16:31:14 +0000
Subject:	Re: cvs: php-src(PHP_5_1) /ext/ming ming.c
References:	1	Groups:	php.cvs
Request:	Send a blank email to php-cvs+get-33294@lists.php.net to get a copy of this message

Thx. At 03:54 AM 8/11/2005 +0000, Frank M. Kromann wrote:

fmk             Wed Aug 10 23:54:07 2005 EDT
  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/ming   ming.c
Log: Revert the last patch so we can release PHP 5.1 http://cvs.php.net/diff.php/php-src/ext/ming/ming.c?r1=1.79&r2=1.79.2.1&ty=u Index: php-src/ext/ming/ming.c diff -u php-src/ext/ming/ming.c:1.79 php-src/ext/ming/ming.c:1.79.2.1
--- php-src/ext/ming/ming.c:1.79        Sat Aug  6 01:30:17 2005
+++ php-src/ext/ming/ming.c     Wed Aug 10 23:54:04 2005
@@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ming.c,v 1.79 2005/08/06 05:30:17 fmk Exp $ */ +/* $Id: ming.c,v 1.79.2.1 2005/08/11 03:54:04 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,6 +2244,25 @@
                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) {
+                       WRONG_PARAM_COUNT;
+               }
+
+               convert_to_long_ex(zlimit);
+               limit = Z_LVAL_PP(zlimit);
+
+               if ((limit < 0) || (limit > 9)) {
+                       php_error(E_WARNING,"compression level must be within 0..9");
+                       RETURN_FALSE;
+               }
+       }
+       RETURN_LONG(SWFMovie_output(movie, &phpByteOutputMethod, NULL, limit));
#else
        RETURN_LONG(SWFMovie_output(movie, &phpByteOutputMethod, NULL));
#endif @@ -2263,9 +2282,11 @@ 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 @@ -2278,7 +2299,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) == FAILURE)
                        WRONG_PARAM_COUNT;
                convert_to_long_ex(zlimit);
@@ -2287,6 +2308,8 @@
                        php_error(E_WARNING,"compression level must be within 0..9");
                        RETURN_FALSE;
                }
+#endif +#if defined(HAVE_MING_ZLIB) && !defined(HAVE_NEW_MING)
                oldval = Ming_setSWFCompression(limit);
#endif
                break;
@@ -2295,11 +2318,13 @@
        }
        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), &phpStreamOutputMethod, what);
        if (oldval >= -1 && oldval <=9)
                Ming_setSWFCompression(oldval);
        RETURN_LONG(out);
+#elif defined(HAVE_NEW_MING)
+       RETURN_LONG(SWFMovie_output(movie, &phpStreamOutputMethod, what, limit));
#else
        RETURN_LONG(SWFMovie_output(movie, &phpStreamOutputMethod, what));
#endif @@ -2311,9 +2336,11 @@ 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;
#endif
        long retval;
@@ -2326,7 +2353,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) == FAILURE) {
                        WRONG_PARAM_COUNT;
                }
@@ -2336,6 +2363,8 @@
                        php_error(E_WARNING,"compression level must be within 0..9");
                        RETURN_FALSE;
                }
+#endif +#if defined(HAVE_MING_ZLIB) && !defined(HAVE_NEW_MING)
                oldval = Ming_setSWFCompression(limit);
#endif
                break;
@@ -2345,12 +2374,16 @@
        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));
+#else
                RETVAL_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);
#endif
                return;
+#endif
        }
        convert_to_string_ex(x);
@@ -2360,9 +2393,13 @@
                RETURN_FALSE;
        }
+#if defined(HAVE_NEW_MING)
+       retval = SWFMovie_output(getMovie(getThis() TSRMLS_CC), &phpStreamOutputMethod, (void *)stream, limit);
+#else
        retval = SWFMovie_output(getMovie(getThis() TSRMLS_CC), &phpStreamOutputMethod, (void *)stream);
+#endif
        php_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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php