com php-src: lucky that the name is not used, fix name of encoder: ext/gd/gd.c
| From: | Pierre Joye | Date: | Thu, 11 Apr 2013 04:42:38 +0000 |
| Subject: | com php-src: lucky that the name is not used, fix name of encoder: ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71925@lists.php.net to get a copy of this message | ||
Commit: 684f4d5272fc4a3bb1aecb14674f610227a9ca5e
Author: Pierre Joye <pierre.php@gmail.com> Thu, 11 Apr 2013 06:42:38 +0200
Parents: c480bf3fb2f04952f4421df197c58b07b479c1c1
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=684f4d5272fc4a3bb1aecb14674f610227a9ca5e
Log:
lucky that the name is not used, fix name of encoder
Changed paths:
M ext/gd/gd.c
Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 0984c87..87e8893 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2830,7 +2830,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type,
char
#if HAVE_GD_BUNDLED
PHP_FUNCTION(imagexbm)
{
- _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XBM, "GIF",
gdImageXbmCtx);
+ _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XBM, "XBM",
gdImageXbmCtx);
}
#endif
/* }}} */
@@ -2850,7 +2850,7 @@ PHP_FUNCTION(imagegif)
Output PNG image to browser or file */
PHP_FUNCTION(imagepng)
{
- _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG, "GIF",
gdImagePngCtxEx);
+ _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG, "PNG",
gdImagePngCtxEx);
}
/* }}} */
#endif /* HAVE_GD_PNG */
@@ -2861,7 +2861,7 @@ PHP_FUNCTION(imagepng)
Output PNG image to browser or file */
PHP_FUNCTION(imagewebp)
{
- _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "GIF",
gdImageWebpCtx);
+ _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP",
gdImageWebpCtx);
}
/* }}} */
#endif /* HAVE_GD_WEBP */
@@ -2872,7 +2872,7 @@ PHP_FUNCTION(imagewebp)
Output JPEG image to browser or file */
PHP_FUNCTION(imagejpeg)
{
- _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG, "GIF",
gdImageJpegCtx);
+ _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG, "JPEG",
gdImageJpegCtx);
}
/* }}} */
#endif /* HAVE_GD_JPG */
@@ -2882,7 +2882,7 @@ PHP_FUNCTION(imagejpeg)
Output WBMP image to browser or file */
PHP_FUNCTION(imagewbmp)
{
- _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM, "GIF",
gdImageWBMPCtx);
+ _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM, "WBMP",
gdImageWBMPCtx);
}
/* }}} */
#endif /* HAVE_GD_WBMP */