mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-17 22:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source 
* PHP-5.4:
  lucky that the name is not used, fix name of encoder
This commit is contained in:
Pierre Joye 2013-04-11 07:08:39 +02:00
commit e71b794569
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/gd/gd.c
View File

@ -2955,7 +2955,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
#if HAVE_GD_BUNDLED #if HAVE_GD_BUNDLED
PHP_FUNCTION(imagexbm) 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 #endif
/* }}} */ /* }}} */
@ -2975,7 +2975,7 @@ PHP_FUNCTION(imagegif)
Output PNG image to browser or file */ Output PNG image to browser or file */
PHP_FUNCTION(imagepng) 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 */ #endif /* HAVE_GD_PNG */
@ -2986,7 +2986,7 @@ PHP_FUNCTION(imagepng)
Output PNG image to browser or file */ Output PNG image to browser or file */
PHP_FUNCTION(imagewebp) 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 */ #endif /* HAVE_GD_WEBP */
@ -2997,7 +2997,7 @@ PHP_FUNCTION(imagewebp)
Output JPEG image to browser or file */ Output JPEG image to browser or file */
PHP_FUNCTION(imagejpeg) 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 */ #endif /* HAVE_GD_JPG */
@ -3007,7 +3007,7 @@ PHP_FUNCTION(imagejpeg)
Output WBMP image to browser or file */ Output WBMP image to browser or file */
PHP_FUNCTION(imagewbmp) 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 */ #endif /* HAVE_GD_WBMP */