Merge branch 'PHP-7.4'

* PHP-7.4:
  Remove dead code

diff --cc ext/gd/gd.c
index 45f1a4c874711d6cb6d3e7091390329414fe5b94,6849be18259c6b94a20dfd3780f86f5fa9d96df4..7be602c994517aa42730a9aad8d91ee6c8fef4cb
--- 1/ext/gd/gd.c
--- 2/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -2559,7 -2594,7 +2559,6 @@@ static void _php_image_output(INTERNAL_
        int argc = ZEND_NUM_ARGS();
        int q = -1, i, t = 1;
  
-       /* When called from imagewbmp() the quality parameter stands for the foreground color. Default: black. */
 -      /* 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) {

diff --cc ext/gd/gd_ctx.c
Simple merge