diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-02-24 11:31:22 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-02-24 11:32:03 +0100 |
| commit | 8c396e0e88527393cebc8194d9a5e30f0c4429c9 (patch) | |
| tree | 275fd1f96869c56a489c45172dc6785f8229e6e4 | |
| parent | c904d380a288ed50b62ef93c733883dc2fad2301 (diff) | |
| parent | a358211a75ef17a51f67df471552df92c68fa565 (diff) | |
| download | php-git-8c396e0e88527393cebc8194d9a5e30f0c4429c9.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix imagesetinterpolation arginfo
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/gd/gd.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -19,6 +19,9 @@ PHP NEWS - FTP: . Fixed ftp_pasv arginfo. (carusogabriel) +-GD: + . Fixed imagesetinterpolation arginfo. (Gabriel Caruso) + - LDAP: . Fixed bug #49876 (Fix LDAP path lookup on 64-bit distros). (dzuelke) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 9c728cf692..1b9bc8c85e 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -848,7 +848,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imageaffinematrixconcat, 0) ZEND_ARG_INFO(0, m2) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_imagesetinterpolation, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_imagesetinterpolation, 0, 0, 1) ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, method) ZEND_END_ARG_INFO() |