From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 4 Apr 2004 18:00:23 +0000 (+0000)
Subject: MFH: Fixed a bug that prevented building of the GD extension against
X-Git-Tag: php-4.3.6RC2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad63c6c086be91ab15ba30cf29742f243b7fe285;p=php

MFH: Fixed a bug that prevented building of the GD extension against
external GD lib 1.X.
---

diff --git a/NEWS b/NEWS
index 90dd21d594..278e3fc360 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 01 Apr 2004, Version 4.3.6RC1
 - Synchronized bundled GD library with GD 2.0.22. (Ilia)
+- Fixed a bug that prevented building of the GD extension against external GD
+  lib 1.X. (Ilia, Nick Talbott).
 - Fixed bug #27849 (configure craps out on trivial syntax error). (Derick)
 - Fixed bug #27822 (is_resource() returns TRUE for closed resources). (Derick)
 - Fixed bug #27819 (problems returning reference to a reference parameter).
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 47b8deb389..2a9890968c 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1616,6 +1616,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
 		}
 
 		switch(image_type) {
+#ifdef HAVE_GD_WBMP
 			case PHP_GDIMG_CONVERT_WBM:
 				if (q == -1) {
  					q = 0;
@@ -1625,6 +1626,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
 				}
 				gdImageWBMP(im, q, fp);
 				break;
+#endif
 			case PHP_GDIMG_TYPE_JPG:
 				(*func_p)(im, fp, q);
 				break;
@@ -1663,6 +1665,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
 		}
 
 		switch(image_type) {
+#ifdef HAVE_GD_WBMP
 			case PHP_GDIMG_CONVERT_WBM:
 				if (q == -1) {
  					q = 0;
@@ -1672,6 +1675,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
 				}
 				gdImageWBMP(im, q, tmp);
 				break;
+#endif
 			case PHP_GDIMG_TYPE_JPG:
 				(*func_p)(im, tmp, q);
 				break;