From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 3 Sep 2016 11:46:03 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC2~56^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bc7e0c0ce7096590fdb3dce62e949df47c4c245;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

0bc7e0c0ce7096590fdb3dce62e949df47c4c245
diff --cc ext/gd/gd.c
index 462029cc8d,659c4143a8..e6ff62036b
--- 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;