pajoye Sun Jul 6 17:07:26 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd config.w32 gd.c
Log:
- MFH:
- update lib/headers detection
- nuke unused variables
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4&r2=1.10.4.4.2.1&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4
php-src/ext/gd/config.w32:1.10.4.4.2.1
--- php-src/ext/gd/config.w32:1.10.4.4 Tue Apr 17 15:31:45 2007
+++ php-src/ext/gd/config.w32 Sun Jul 6 17:07:26 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4 2007/04/17 15:31:45 pajoye Exp $
+// $Id: config.w32,v 1.10.4.4.2.1 2008/07/06 17:07:26 pajoye Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -6,9 +6,14 @@
if (PHP_GD != "no") {
if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
- CHECK_LIB("freetype2.lib", "gd", PHP_GD) &&
- CHECK_LIB("libpng.lib", "gd", PHP_GD) &&
- CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD +
";ext\\gd\\libgd")
+ (CHECK_LIB("freetype.lib", "gd", PHP_GD) ||
CHECK_LIB("freetype2.lib", "gd", PHP_GD) ) &&
+ (CHECK_LIB("libpng_a.lib", "gd", PHP_GD) ||
CHECK_LIB("libpng.lib", "gd", PHP_GD) ) &&
+ (CHECK_LIB("zlib_a.lib", "gd", PHP_GD) || CHECK_LIB("zlib.lib",
"gd", PHP_GD) ) &&
+ (CHECK_LIB("libiconv_a.lib", "gd", PHP_GD) ||
CHECK_LIB("libiconv.lib", "gd", PHP_GD) ) &&
+ CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD +
";ext\\gd\\libgd") &&
+ (CHECK_LIB("libiconv_a.lib", "iconv", PHP_ICONV) ||
CHECK_LIB("libiconv.lib", "iconv", PHP_ICONV) ||
+ CHECK_LIB("iconv_a.lib", "iconv", PHP_ICONV) ||
CHECK_LIB("iconv.lib", "iconv", PHP_ICONV)) &&
+ CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV)
) {
if (PHP_T1LIB != "no") {
if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.8&r2=1.312.2.20.2.32.2.9&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.8
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.9
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.8 Sun Jun 22 11:36:46 2008
+++ php-src/ext/gd/gd.c Sun Jul 6 17:07:26 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.8 2008/06/22 11:36:46 felipe Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.9 2008/07/06 17:07:26 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2168,8 +2168,6 @@
HDC memDC;
HBITMAP memBM;
HBITMAP hOld;
- HINSTANCE handle;
- long lwindow_handle;
typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT);
tPrintWindow pPrintWindow = 0;
gdImagePtr im;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
