summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2016-09-03 13:53:07 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2016-09-03 13:53:07 +0200
commit9eeb705ecad0d563ee85dac38164c035e47d0d84 (patch)
tree2b8d31917a1233f66104ef0ec4c573856627bacf
parent5bdf2fa3456e4b2fca53b9eff24c81e724e93170 (diff)
parent0bc7e0c0ce7096590fdb3dce62e949df47c4c245 (diff)
downloadphp-git-9eeb705ecad0d563ee85dac38164c035e47d0d84.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
-rw-r--r--ext/gd/gd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index bd5af9004a..25685999e7 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1521,7 +1521,7 @@ PHP_FUNCTION(imageistruecolor)
/* }}} */
/* {{{ proto void imagetruecolortopalette(resource im, bool ditherFlag, int colorsWanted)
- Convert a true colour image to a palette based image with a number of colours, optionally using dithering. */
+ Convert a true color image to a palette based image with a number of colors, optionally using dithering. */
PHP_FUNCTION(imagetruecolortopalette)
{
zval *IM;
@@ -1547,8 +1547,8 @@ PHP_FUNCTION(imagetruecolortopalette)
}
/* }}} */
-/* {{{ proto void imagetruecolortopalette(resource im, bool ditherFlag, int colorsWanted)
- Convert a true colour image to a palette based image with a number of colours, optionally using dithering. */
+/* {{{ proto void imagepalettetotruecolor(resource im)
+ Convert a palette based image to a true color image. */
PHP_FUNCTION(imagepalettetotruecolor)
{
zval *IM;