From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 1 Nov 2019 22:48:05 +0000 (+0100)
Subject: Remove unused code
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88bab00199306d32863d06262d8499d7b2ebe65b;p=php

Remove unused code

These are left-overs from image2wbmp(), which has already been removed.
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 7b973fff79..989a78cb0b 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2005,15 +2005,6 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
 		}
 
 		switch (image_type) {
-			case PHP_GDIMG_CONVERT_WBM:
-				if (q == -1) {
-					q = 0;
-				} else if (q < 0 || q > 255) {
-					php_error_docref(NULL, E_WARNING, "Invalid threshold value '%d'. It must be between 0 and 255", q);
-					q = 0;
-				}
-				gdImageWBMP(im, q, fp);
-				break;
 			case PHP_GDIMG_TYPE_GD:
 				(*func_p)(im, fp);
 				break;
@@ -2041,15 +2032,6 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
 		}
 
 		switch (image_type) {
-			case PHP_GDIMG_CONVERT_WBM:
- 				if (q == -1) {
-  					q = 0;
-  				} else if (q < 0 || q > 255) {
-  					php_error_docref(NULL, E_WARNING, "Invalid threshold value '%d'. It must be between 0 and 255", q);
- 					q = 0;
-  				}
-				gdImageWBMP(im, q, tmp);
-				break;
 			case PHP_GDIMG_TYPE_GD:
 				(*func_p)(im, tmp);
 				break;
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index 4f08357880..8e4cff35ef 100644
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -33,7 +33,6 @@
 #define PHP_GDIMG_TYPE_WBM      4
 #define PHP_GDIMG_TYPE_XBM      5
 #define PHP_GDIMG_TYPE_XPM      6
-#define PHP_GDIMG_CONVERT_WBM   7
 #define PHP_GDIMG_TYPE_GD       8
 #define PHP_GDIMG_TYPE_GD2      9
 #define PHP_GDIMG_TYPE_GD2PART  10