com php-src: Merge branch 'PHP-7.4': ext/gd/gd.c ext/zip/php_ zip.c
| From: | Christoph Michael Becker | Date: | Sun, 17 Mar 2019 22:32:53 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': ext/gd/gd.c ext/zip/php_ zip.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105182@lists.php.net to get a copy of this message | ||
Commit: 7ad6e1d7de7c6e171804f99b905b97863a8d9e34
Author: Christoph M. Becker <cmbecker69@gmx.de> Sun, 17 Mar 2019 23:32:53 +0100
Parents: 0a72c91009a6692b111b40074ecb453912bb35ef b6f9ade9f201c852430689caf8ed8af0ded0159a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7ad6e1d7de7c6e171804f99b905b97863a8d9e34
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unused variables
Changed paths:
MM ext/gd/gd.c
MM ext/zip/php_zip.c
Diff:
diff --cc ext/gd/gd.c
index 7be602c,1c03b65..e4a41f4
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -2557,8 -2592,9 +2557,8 @@@ static void _php_image_output(INTERNAL_
FILE *fp;
size_t file_len = 0;
int argc = ZEND_NUM_ARGS();
- int q = -1, i, t = 1;
+ int q = -1, t = 1;
- /* The quality parameter for Wbmp stands for the foreground when called from image2wbmp() */
/* The quality parameter for gd2 stands for chunk size */
if (zend_parse_parameters(argc, "r|pll", &imgind, &file, &file_len,
&quality, &type) == FAILURE) {