iliaa Sun Apr 4 14:00:24 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/gd gd.c
Log:
MFH: Fixed a bug that prevented building of the GD extension against
external GD lib 1.X.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.627&r2=1.1247.2.628&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.627 php-src/NEWS:1.1247.2.628
--- php-src/NEWS:1.1247.2.627 Sat Apr 3 12:23:14 2004
+++ php-src/NEWS Sun Apr 4 14:00:23 2004
@@ -2,6 +2,8 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
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).
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.221.2.37&r2=1.221.2.38&ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.221.2.37 php-src/ext/gd/gd.c:1.221.2.38
--- php-src/ext/gd/gd.c:1.221.2.37 Mon Mar 29 13:21:00 2004
+++ php-src/ext/gd/gd.c Sun Apr 4 14:00:23 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.221.2.37 2004/03/29 18:21:00 iliaa Exp $ */
+/* $Id: gd.c,v 1.221.2.38 2004/04/04 18:00:23 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1616,6 +1616,7 @@
}
switch(image_type) {
+#ifdef HAVE_GD_WBMP
case PHP_GDIMG_CONVERT_WBM:
if (q == -1) {
q = 0;
@@ -1625,6 +1626,7 @@
}
gdImageWBMP(im, q, fp);
break;
+#endif
case PHP_GDIMG_TYPE_JPG:
(*func_p)(im, fp, q);
break;
@@ -1663,6 +1665,7 @@
}
switch(image_type) {
+#ifdef HAVE_GD_WBMP
case PHP_GDIMG_CONVERT_WBM:
if (q == -1) {
q = 0;
@@ -1672,6 +1675,7 @@
}
gdImageWBMP(im, q, tmp);
break;
+#endif
case PHP_GDIMG_TYPE_JPG:
(*func_p)(im, tmp, q);
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
