From: Remi Collet <remi@php.net>
Date: Wed, 24 Apr 2013 14:15:11 +0000 (+0200)
Subject: allow use of gdImageCreateFromJpegEx with system libgd
X-Git-Tag: php-5.5.0beta4~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a8ceed844910146398572d1336ac1c23c5006f2;p=php

allow use of gdImageCreateFromJpegEx with system libgd
---

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index e27411d5c8..9152c1926f 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -287,6 +287,7 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
   PHP_CHECK_LIBRARY(gd, gdImageConvolution,     [AC_DEFINE(HAVE_GD_IMAGE_CONVOLUTION,      1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImagePixelate,        [AC_DEFINE(HAVE_GD_IMAGE_PIXELATE,         1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImageFlipBoth,        [AC_DEFINE(HAVE_GD_IMAGE_FLIP,       1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpegEx,[AC_DEFINE(HAVE_GD_JPGEX,            1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
 ])
 
 dnl
@@ -358,6 +359,7 @@ dnl enable the support in bundled GD library
 
   if test -n "$GD_JPEG_DIR"; then
     AC_DEFINE(HAVE_GD_JPG, 1, [ ])
+    AC_DEFINE(HAVE_GD_JPGEX, 1, [ ])
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBJPEG"
   fi
 
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index b9ed1cd860..7da9e25a1d 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2565,7 +2565,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 	gdImagePtr im = NULL;
 	php_stream *stream;
 	FILE * fp = NULL;
-#ifdef HAVE_GD_JPG
+#ifdef HAVE_GD_JPGEX
 	long ignore_warning;
 #endif
 	if (image_type == PHP_GDIMG_TYPE_GD2PART) {
@@ -2668,8 +2668,8 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 
 #ifdef HAVE_GD_JPG
 			case PHP_GDIMG_TYPE_JPG:
+#ifdef HAVE_GD_JPGEX
 				ignore_warning = INI_INT("gd.jpeg_ignore_warning");
-#ifdef HAVE_GD_BUNDLED
 				im = gdImageCreateFromJpegEx(fp, ignore_warning);
 #else
 				im = gdImageCreateFromJpeg(fp);
@@ -4728,7 +4728,7 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
 	int int_threshold;
 	int x, y;
 	float x_ratio, y_ratio;
-#ifdef HAVE_GD_JPG
+#ifdef HAVE_GD_JPGEX
     long ignore_warning;
 #endif
 	
@@ -4781,8 +4781,8 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
 
 #ifdef HAVE_GD_JPG
 		case PHP_GDIMG_TYPE_JPG:
+#ifdef HAVE_GD_JPGEX
 			ignore_warning = INI_INT("gd.jpeg_ignore_warning");
-#ifdef HAVE_GD_BUNDLED
 			im_org = gdImageCreateFromJpegEx(org, ignore_warning);
 #else
 			im_org = gdImageCreateFromJpeg(org);