diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2004-04-04 18:00:23 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2004-04-04 18:00:23 +0000 |
| commit | ad63c6c086be91ab15ba30cf29742f243b7fe285 (patch) | |
| tree | fb7d4a25ce605e7db7beaefe598a1235f18e28ae | |
| parent | 8d802f10f07a71205aa28af3432ab9cf178b9c7e (diff) | |
| download | php-git-ad63c6c086be91ab15ba30cf29742f243b7fe285.tar.gz | |
MFH: Fixed a bug that prevented building of the GD extension against
external GD lib 1.X.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/gd/gd.c | 4 |
2 files changed, 6 insertions, 0 deletions
@@ -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; |