pajoye          Mon Jul  7 08:36:04 2008 UTC

  Modified files:              
    /php-src/ext/gd     config.w32 gd.c 
  Log:
  - restore wrongly removed vars
  - test if zlib is shared or not (possible conflict)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.25 php-src/ext/gd/config.w32:1.26
--- php-src/ext/gd/config.w32:1.25      Sun Jul  6 17:06:43 2008
+++ php-src/ext/gd/config.w32   Mon Jul  7 08:36:04 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.25 2008/07/06 17:06:43 pajoye Exp $
+// $Id: config.w32,v 1.26 2008/07/07 08:36:04 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -8,12 +8,12 @@
        if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
                (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)
+               CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV) 
&&
+               ((!PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib", "gd", PHP_GD))
                ) {
                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.387&r2=1.388&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.387 php-src/ext/gd/gd.c:1.388
--- php-src/ext/gd/gd.c:1.387   Sun Jul  6 17:06:43 2008
+++ php-src/ext/gd/gd.c Mon Jul  7 08:36:04 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: gd.c,v 1.387 2008/07/06 17:06:43 pajoye Exp $ */
+/* $Id: gd.c,v 1.388 2008/07/07 08:36:04 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
    Cold Spring Harbor Labs. */
@@ -1906,6 +1906,8 @@
        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

Reply via email to