From: Pierre Joye <pajoye@php.net>
Date: Tue, 4 Nov 2008 20:25:45 +0000 (+0000)
Subject: - MFH: add png and jpeg version info
X-Git-Tag: BEFORE_NS_RULES_CHANGE~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4e959e4a1a1710429295d6858c0700457d77226;p=php

- MFH: add png and jpeg version info
---

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");