cvs: php-src(PHP_5_2) /ext/gd config.w32 gd.c

pajoye Fri Apr 6 15:38:35 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd config.w32 gd.c Log: - Fix windows mutex intialization, add HAVE_GD_FONTMUTEX and HAVE_LIBFREETYPE to config.w32 (Thanks to Frank for the report) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.1&r2=1.10.4.2&diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.10.4.1 php-src/ext/gd/config.w32:1.10.4.2 --- php-src/ext/gd/config.w32:1.10.4.1 Sat Mar 10 12:18:36 2007 +++ php-src/ext/gd/config.w32 Fri Apr 6 15:38:35 2007 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.10.4.1 2007/03/10 12:18:36 pajoye Exp $ +// $Id: config.w32,v 1.10.4.2 2007/04/06 15:38:35 pajoye Exp $ // vim:ft=javascript ARG_WITH("gd", "Bundled GD support", "yes,shared"); @@ -40,6 +40,8 @@ /D HAVE_GDIMAGECOLORRESOLVE=1 \ /D HAVE_GD_IMAGESETBRUSH=1 \ /D HAVE_GD_IMAGESETTILE=1 \ +/D HAVE_GD_FONTMUTEX=1 \ +/D HAVE_LIBFREETYPE=1 \ /D HAVE_GD_JPG \ /D HAVE_GD_PNG \ /D HAVE_GD_STRINGFTEX=1 \ http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.19&r2=1.312.2.20.2.20&diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.19 php-src/ext/gd/gd.c:1.312.2.20.2.20 --- php-src/ext/gd/gd.c:1.312.2.20.2.19 Thu Apr 5 11:57:57 2007 +++ php-src/ext/gd/gd.c Fri Apr 6 15:38:35 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.312.2.20.2.19 2007/04/05 11:57:57 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.20 2007/04/06 15:38:35 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1219,6 +1219,7 @@ { le_gd = zend_register_list_destructors_ex(php_free_gd_image, NULL, "gd", module_number); le_gd_font = zend_register_list_destructors_ex(php_free_gd_font, NULL, "gd font", module_number); + #if HAVE_GD_FONTMUTEX && HAVE_LIBFREETYPE gdFontCacheMutexSetup(); #endif