diff options
| author | Pierre Joye <pajoye@php.net> | 2009-04-07 09:26:22 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2009-04-07 09:26:22 +0000 |
| commit | 039a1546332f567d80b73c0f765c07f0215136e3 (patch) | |
| tree | c82fe7069bf924cebbfd973c7085ea09348e3295 /ext/gd/gd.c | |
| parent | 2350110e5566b7d00780ce0f8ddde9f0b05d7a3a (diff) | |
| download | php-git-039a1546332f567d80b73c0f765c07f0215136e3.tar.gz | |
- #47812, undefined symbol: gdJpegGetVersionInt
- #46015, Build fails with system gd
- enable gd_compat when built using system's gd
Diffstat (limited to 'ext/gd/gd.c')
| -rw-r--r-- | ext/gd/gd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 4e477ba90a..8525e14309 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -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 @@ static void php_free_ps_enc(zend_rsrc_list_entry *rsrc TSRMLS_DC); #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 @@ PHP_MINFO_FUNCTION(gd) #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); } |