]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 2 Feb 2017 17:14:50 +0000 (18:14 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 2 Feb 2017 17:14:50 +0000 (18:14 +0100)
1  2 
NEWS
ext/gd/gd.c

diff --cc NEWS
Simple merge
diff --cc ext/gd/gd.c
index 72c0083cadeebbcd80d851baa198bdb21e4ac8f5,ec2a037357de07233938967c7c3de553e817521f..9d0dcca6906873941cbe9aa78a60d0a8dd4caa43
@@@ -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