pajoye          Tue Apr  7 09:44:21 2009 UTC

  Modified files:              
    /php-src/ext/gd     config.m4 gd.c 
  Log:
  - MFB:
   - #47812, undefined symbol: gdJpegGetVersionInt
   - #46015, Build fails with system gd
   - enable gd_compat when built using system's gd
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.m4?r1=1.175&r2=1.176&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.175 php-src/ext/gd/config.m4:1.176
--- php-src/ext/gd/config.m4:1.175      Wed Jan 14 18:57:51 2009
+++ php-src/ext/gd/config.m4    Tue Apr  7 09:44:21 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.175 2009/01/14 18:57:51 tabe Exp $
+dnl $Id: config.m4,v 1.176 2009/04/07 09:44:21 pajoye Exp $
 dnl
 
 dnl
@@ -309,7 +309,7 @@
   fi
 
   GD_MODULE_TYPE=external
-  extra_sources="gdcache.c"
+  extra_sources="gdcache.c libgd/gd_compat.c"
 
   GD_FEATURES=`$GDLIB_CONFIG --features`
 
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.409&r2=1.410&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.409 php-src/ext/gd/gd.c:1.410
--- php-src/ext/gd/gd.c:1.409   Tue Mar 24 09:42:49 2009
+++ php-src/ext/gd/gd.c Tue Apr  7 09:44:21 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: gd.c,v 1.409 2009/03/24 09:42:49 pajoye Exp $ */
+/* $Id: gd.c,v 1.410 2009/04/07 09:44:21 pajoye Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
    Cold Spring Harbor Labs. */
@@ -54,6 +54,10 @@
 #endif
 
 #if HAVE_LIBGD
+#if !HAVE_GD_BUNDLED
+# include "libgd/gd_compat.h"
+#endif
+
 
 static int le_gd, le_gd_font;
 #if HAVE_LIBT1
@@ -75,7 +79,6 @@
 # ifdef HAVE_LIBFREETYPE
 #  include <ft2build.h>
 #  include FT_FREETYPE_H
-# else
 # endif
 #endif
 
@@ -1181,8 +1184,10 @@
 #endif
 /* }}} */
 
-#ifdef HAVE_GD_BUNDLED
-#define PHP_GD_VERSION_STRING "bundled (2.0.28 compatible)"
+#if HAVE_GD_BUNDLED
+#define PHP_GD_VERSION_STRING "bundled (2.0.34 compatible)"
+#else
+#define PHP_GD_VERSION_STRING "2.0"
 #endif
 
 /* {{{ PHP_MINFO_FUNCTION
@@ -1212,6 +1217,7 @@
 #endif
                php_info_print_table_row(2, "FreeType Version", tmp);
        }
+#else
        php_info_print_table_row(2, "FreeType Linkage", "with unknown library");
 #endif
 #endif
@@ -1231,8 +1237,8 @@
 #ifdef HAVE_GD_JPG
        {
                char tmp[12];
-               snprintf(tmp, sizeof(tmp), "%d", gdJpegGetVersionInt());
-               php_info_print_table_row(2, "JPG Support", "enabled");
+               snprintf(tmp, sizeof(tmp), "%s", gdJpegGetVersionString());
+               php_info_print_table_row(2, "JPEG Support", "enabled");
                php_info_print_table_row(2, "libJPEG Version", tmp);
        }
 #endif



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to