- MFB: #36686, do not be quiet with the extern GD

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 82b9466ec934ce41e33efa1c3551b2404a57ba86..d6729c66fbdbd08a3b332a7d1a3da3d0621a5891 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1456,7 +1456,11 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 #ifdef HAVE_GD_JPG
                        case PHP_GDIMG_TYPE_JPG:
                                ignore_warning = INI_INT("gd.jpeg_ignore_warning");
+#ifdef HAVE_GD_BUNDLED
                                im = gdImageCreateFromJpeg(fp, ignore_warning);
+#else
+                               im = gdImageCreateFromJpeg(fp);
+#endif
                                break;
 #endif
 
@@ -3649,7 +3653,11 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
 #ifdef HAVE_GD_JPG
                case PHP_GDIMG_TYPE_JPG:
                        ignore_warning = INI_INT("gd.jpeg_ignore_warning");
+#ifdef HAVE_GD_BUNDLED
                        im_org = gdImageCreateFromJpeg(org, ignore_warning);
+#else
+                       im_org = gdImageCreateFromJpeg(org);
+#endif
                        if (im_org == NULL) {
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' Not a valid JPEG file", fn_dest);
                                RETURN_FALSE;