MFH: implement my own FR #36995

add missing ifdefs

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 149a19d947c8334ff5887c5a81358928a9e8a065..2994eb2c8b281af1971283c41d73a2acadfbbe51 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2357,8 +2357,9 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
        php_stream *stream;
        FILE * fp = NULL;
        int argc=ZEND_NUM_ARGS();
+#ifdef HAVE_GD_JPG
        long ignore_warning;
-
+#endif
 
        if ((image_type == PHP_GDIMG_TYPE_GD2PART && argc != 5) ||
                (image_type != PHP_GDIMG_TYPE_GD2PART && argc != 1) ||
@@ -4672,7 +4673,9 @@ 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
     long ignore_warning;
+#endif
        
        if (argc != 5 || zend_get_parameters_ex(argc, &f_org, &f_dest, &height, &width, &threshold) == FAILURE) {
                ZEND_WRONG_PARAM_COUNT();

diff --git a/ext/gd/gd_ctx.c b/ext/gd/gd_ctx.c
index f92d519c1f0c18326c0143f9b4de94fc73c44141..480b8e3e57fd547d5ebfb708d145b51aed9231b3 100644 (file)
--- a/ext/gd/gd_ctx.c
+++ b/ext/gd/gd_ctx.c
@@ -93,7 +93,7 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 
                fp = VCWD_FOPEN(fn, "wb");
                if (!fp) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn);
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing: %s", fn, strerror(errno));
                        RETURN_FALSE;
                }