com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/gd/gd.c
| From: | Nikita Popov | Date: | Thu, 02 Feb 2017 17:14:50 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96989@lists.php.net to get a copy of this message | ||
Commit: 2d1955796ea00ce8f718502d583394ad0d05d266
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 2 Feb 2017 18:14:50 +0100
Parents: d2658287fa19191ddf19142089abdd880534badb acda2563cea2acacdb126a6c14a144a9bf52e3a3
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2d1955796ea00ce8f718502d583394ad0d05d266
Log:
Merge branch 'PHP-7.0' into PHP-7.1
Changed paths:
MM NEWS
MM ext/gd/gd.c
Diff:
diff --cc ext/gd/gd.c
index 72c0083,ec2a037..9d0dcca
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -367,7 -367,9 +367,9 @@@ ZEND_END_ARG_INFO(
#ifdef HAVE_GD_PNG
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepng, 0, 0, 1)
ZEND_ARG_INFO(0, im)
- ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, to)
+ ZEND_ARG_INFO(0, quality)
+ ZEND_ARG_INFO(0, filters)
ZEND_END_ARG_INFO()
#endif