pajoye Tue Apr 7 09:26:23 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd config.m4 gd.c
/php-src/ext/gd/libgd gd_jpeg.c
Log:
- #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.154.2.1.2.6.2.2&r2=1.154.2.1.2.6.2.3&diff_format=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.154.2.1.2.6.2.2
php-src/ext/gd/config.m4:1.154.2.1.2.6.2.3
--- php-src/ext/gd/config.m4:1.154.2.1.2.6.2.2 Wed Jan 14 19:05:59 2009
+++ php-src/ext/gd/config.m4 Tue Apr 7 09:26:22 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.154.2.1.2.6.2.2 2009/01/14 19:05:59 tabe Exp $
+dnl $Id: config.m4,v 1.154.2.1.2.6.2.3 2009/04/07 09:26:22 pajoye Exp $
dnl
dnl
@@ -184,6 +184,7 @@
PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
+ AC_DEFINE(ENABLE_GD_TTF,1,[ ])
],[
AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for
more information.])
],[
@@ -328,7 +329,8 @@
if test -n "$FREETYPE2_DIR"; then
AC_DEFINE(HAVE_GD_STRINGFT, 1, [ ])
AC_DEFINE(HAVE_GD_STRINGFTEX, 1, [ ])
- GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE"
+ AC_DEFINE(ENABLE_GD_TTF, 1, [ ])
+ GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE -DENABLE_GD_TTF"
fi
if test -n "$USE_GD_JIS_CONV"; then
@@ -340,7 +342,7 @@
if test "$PHP_GD" != "no"; then
GD_MODULE_TYPE=external
- extra_sources="gdcache.c"
+ extra_sources="gdcache.c libgd/gd_compat.c"
dnl Various checks for GD features
PHP_GD_ZLIB
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.34&r2=1.312.2.20.2.32.2.35&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.34
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.35
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.34 Thu Mar 26 00:43:45 2009
+++ php-src/ext/gd/gd.c Tue Apr 7 09:26:22 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.34 2009/03/26 00:43:45 felipe Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.35 2009/04/07 09:26:22 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
@@ -69,7 +73,6 @@
#include <gdfontmb.h> /* 3 Medium bold font */
#include <gdfontl.h> /* 4 Large font */
#include <gdfontg.h> /* 5 Giant font */
-#include <gdhelpers.h>
#ifdef HAVE_GD_WBMP
#include "libgd/wbmp.h"
@@ -1294,7 +1297,7 @@
#ifdef HAVE_GD_JPG
{
char tmp[12];
- snprintf(tmp, sizeof(tmp), "%d", gdJpegGetVersionInt());
+ snprintf(tmp, sizeof(tmp), "%s", gdJpegGetVersionString());
php_info_print_table_row(2, "JPEG Support", "enabled");
php_info_print_table_row(2, "libJPEG Version", tmp);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_jpeg.c?r1=1.18.4.2.4.1&r2=1.18.4.2.4.2&diff_format=u
Index: php-src/ext/gd/libgd/gd_jpeg.c
diff -u php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2.4.1
php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2.4.2
--- php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2.4.1 Thu Nov 6 10:14:37 2008
+++ php-src/ext/gd/libgd/gd_jpeg.c Tue Apr 7 09:26:22 2009
@@ -107,6 +107,18 @@
return JPEG_LIB_VERSION;
}
+const char * gdJpegGetVersionString()
+{
+ switch(JPEG_LIB_VERSION) {
+ case 62:
+ return "6b";
+ break;
+ default:
+ return "unknown";
+ }
+}
+
+
/*
* Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality
* QUALITY. If QUALITY is in the range 0-100, increasing values
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
