pajoye Tue Nov 4 20:25:45 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd gd.c
Log:
- MFH: add png and jpeg version info
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.21&r2=1.312.2.20.2.32.2.22&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.21
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.22
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.21 Sun Nov 2 21:19:31 2008
+++ php-src/ext/gd/gd.c Tue Nov 4 20:25:45 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.21 2008/11/02 21:19:31 felipe Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.22 2008/11/04 20:25:45 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -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_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");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
