diff options
| author | Remi Collet <remi@php.net> | 2013-06-24 11:15:56 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-06-24 11:15:56 +0200 |
| commit | 8e4e38aaeea0944a976fd2629c210c87483dcb3f (patch) | |
| tree | 78fd9846da632543e7cbfb6a3cc8363377767a8c /ext/gd | |
| parent | 8c694401bb817ce645abe87c094615a3d5ed87ce (diff) | |
| parent | 9da4985bf2d532ed72fbd3a7d3390464692cce7a (diff) | |
| download | php-git-8e4e38aaeea0944a976fd2629c210c87483dcb3f.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
fix imagecreatefromwebp and imagewebp protos
Diffstat (limited to 'ext/gd')
| -rw-r--r-- | ext/gd/gd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 14dd90b81a..7da8a62a39 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2486,8 +2486,8 @@ PHP_FUNCTION(imagecreatefrompng) #endif /* HAVE_GD_PNG */ #ifdef HAVE_GD_WEBP -/* {{{ proto resource imagecreatefrompng(string filename) - Create a new image from PNG file or URL */ +/* {{{ proto resource imagecreatefromwebp(string filename) + Create a new image from WEBP file or URL */ PHP_FUNCTION(imagecreatefromwebp) { _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageCreateFromWebp, gdImageCreateFromWebpCtx); @@ -2726,7 +2726,7 @@ PHP_FUNCTION(imagepng) #ifdef HAVE_GD_WEBP /* {{{ proto bool imagewebp(resource im [, string filename[, quality]] ) - Output PNG image to browser or file */ + Output WEBP image to browser or file */ PHP_FUNCTION(imagewebp) { _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageWebpCtx); |