summaryrefslogtreecommitdiff
path: root/ext/gd
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2008-11-04 20:25:45 +0000
committerPierre Joye <pajoye@php.net>2008-11-04 20:25:45 +0000
commita4e959e4a1a1710429295d6858c0700457d77226 (patch)
tree49b8ac7797e7c712faf3f637b667ba8c3f7dbc12 /ext/gd
parent80e3ed56307174b62cfc6aeeea4f8906ee62d24e (diff)
downloadphp-git-a4e959e4a1a1710429295d6858c0700457d77226.tar.gz
- MFH: add png and jpeg version info
Diffstat (limited to 'ext/gd')
-rw-r--r--ext/gd/gd.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 1c4149c7bf..8c6f5fe7f6 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -33,6 +33,10 @@
/* needs to be first */
#include <png.h>
#endif
+#ifdef HAVE_GD_JPG
+/* needs to be first */
+#include <jpeglib.h>
+#endif
#include "php.h"
#include "php_ini.h"
@@ -1390,10 +1394,16 @@ PHP_MINFO_FUNCTION(gd)
php_info_print_table_row(2, "GIF Create Support", "enabled");
#endif
#ifdef HAVE_GD_JPG
- php_info_print_table_row(2, "JPG Support", "enabled");
+ {
+ char tmp[256];
+ snprintf(tmp, sizeof(tmp), "%d", JPEG_LIB_VERSION);
+ php_info_print_table_row(2, "JPG Support", "enabled");
+ php_info_print_table_row(2, "libJPEG Version", tmp);
+ }
#endif
#ifdef HAVE_GD_PNG
php_info_print_table_row(2, "PNG Support", "enabled");
+ php_info_print_table_row(2, "libPNG Version", PNG_LIBPNG_VER_STRING);
#endif
#ifdef HAVE_GD_WBMP
php_info_print_table_row(2, "WBMP Support", "enabled");