diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-02-28 13:18:49 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-02-28 13:18:49 +0100 |
| commit | ebefb95fda95b5e1414838f69ea590fddff13495 (patch) | |
| tree | a09d0dcb4541516bb89fba835436d9e4dd87a875 | |
| parent | ca8e2abb8e21b65a762815504d1fb3f20b7b45bc (diff) | |
| parent | 345a75f5419c5ec37086ede199a1a8b9623ff407 (diff) | |
| download | php-git-ebefb95fda95b5e1414838f69ea590fddff13495.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove dead code
| -rw-r--r-- | ext/gd/gd.c | 30 | ||||
| -rw-r--r-- | ext/gd/gd_ctx.c | 4 |
2 files changed, 2 insertions, 32 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 45f1a4c874..7be602c994 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2559,7 +2559,6 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char 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 gd2 stands for chunk size */ if (zend_parse_parameters(argc, "r|pll", &imgind, &file, &file_len, &quality, &type) == FAILURE) { @@ -2599,15 +2598,6 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char } gdImageWBMP(im, q, fp); break; - case PHP_GDIMG_TYPE_JPG: - (*func_p)(im, fp, q); - break; - case PHP_GDIMG_TYPE_WBM: - for (i = 0; i < gdImageColorsTotal(im); i++) { - if (gdImageRed(im, i) == 0) break; - } - (*func_p)(im, i, fp); - break; case PHP_GDIMG_TYPE_GD: (*func_p)(im, fp); break; @@ -2618,11 +2608,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char (*func_p)(im, fp, q, t); break; default: - if (q == -1) { - q = 128; - } - (*func_p)(im, fp, q, t); - break; + ZEND_ASSERT(0); } fflush(fp); fclose(fp); @@ -2648,17 +2634,6 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char } gdImageWBMP(im, q, tmp); break; - case PHP_GDIMG_TYPE_JPG: - (*func_p)(im, tmp, q); - break; - case PHP_GDIMG_TYPE_WBM: - for (i = 0; i < gdImageColorsTotal(im); i++) { - if (gdImageRed(im, i) == 0) { - break; - } - } - (*func_p)(im, q, tmp); - break; case PHP_GDIMG_TYPE_GD: (*func_p)(im, tmp); break; @@ -2669,8 +2644,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char (*func_p)(im, tmp, q, t); break; default: - (*func_p)(im, tmp); - break; + ZEND_ASSERT(0); } fseek(tmp, 0, SEEK_SET); diff --git a/ext/gd/gd_ctx.c b/ext/gd/gd_ctx.c index 74f09c2d5f..d563eb1384 100644 --- a/ext/gd/gd_ctx.c +++ b/ext/gd/gd_ctx.c @@ -176,10 +176,6 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, } switch(image_type) { - case PHP_GDIMG_CONVERT_WBM: - if(q<0||q>255) { - php_error_docref(NULL, E_WARNING, "Invalid threshold value '%d'. It must be between 0 and 255", q); - } case PHP_GDIMG_TYPE_JPG: (*func_p)(im, ctx, q); break; |