com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/gd/gd.c

From: Date: Sat, 03 Sep 2016 11:46:03 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/gd/gd.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94276@lists.php.net to get a copy of this message
Commit: 0bc7e0c0ce7096590fdb3dce62e949df47c4c245 Author: Christoph M. Becker <cmbecker69@gmx.de> Sat, 3 Sep 2016 13:46:03 +0200 Parents: f3dc00fdfbf1418665597fd2b406d289a01f4e3f bca913d70a541b0f837aa1394c4c32d6d0d2ffa1 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0bc7e0c0ce7096590fdb3dce62e949df47c4c245 Log: Merge branch 'PHP-5.6' into PHP-7.0 Changed paths: MM ext/gd/gd.c Diff: diff --cc ext/gd/gd.c index 462029c,659c414..e6ff620 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@@ -1547,8 -1668,10 +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;

« previous php.cvs (#94276) next »