pajoye Mon May 7 14:54:36 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/gd gd.c
Log:
- MFH: fix build when use with a museum freetype version (1.x)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.686&r2=1.2027.2.547.2.687&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.686 php-src/NEWS:1.2027.2.547.2.687
--- php-src/NEWS:1.2027.2.547.2.686 Sun May 6 17:21:13 2007
+++ php-src/NEWS Mon May 7 14:54:36 2007
@@ -9,6 +9,7 @@
- Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
- Fixed bug #41293 (Fixed creation of HTTP_RAW_POST_DATA when there is no
default post handler). (Ilia)
+- Fixed gd build when used with freetype 1.x (Pierre, Tony)
- Fixed bug #41287 (Namespace functions don't allow xmlns defintion to be
optional). (Rob)
- Fixed bug #41285 (Improved fix for CVE-2007-1887 to work with non-bundled
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.24&r2=1.312.2.20.2.25&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.24 php-src/ext/gd/gd.c:1.312.2.20.2.25
--- php-src/ext/gd/gd.c:1.312.2.20.2.24 Tue Apr 24 12:51:22 2007
+++ php-src/ext/gd/gd.c Mon May 7 14:54:36 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.24 2007/04/24 12:51:22 sniper Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.25 2007/05/07 14:54:36 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1370,8 +1370,10 @@
char tmp[256];
#ifdef FREETYPE_PATCH
snprintf(tmp, sizeof(tmp), "%d.%d.%d", FREETYPE_MAJOR,
FREETYPE_MINOR, FREETYPE_PATCH);
-#else
+#elif defined(FREETYPE_MAJOR)
snprintf(tmp, sizeof(tmp), "%d.%d", FREETYPE_MAJOR,
FREETYPE_MINOR);
+#else
+ snprintf(tmp, sizeof(tmp), "1.x");
#endif
php_info_print_table_row(2, "FreeType Version", tmp);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
