Merge branch 'PHP-5.6' into PHP-7.0

Author: cmb69

NEWS

@@ -16,6 +16,8 @@ PHP                                                                        NEWS
 
 - GD:
   . Fixed bug #72709 (imagesetstyle() causes OOB read for empty $styles). (cmb)
+  . Fixed bug #66005 (imagecopy does not support 1bit transparency on truecolor
+    images). (cmb)
 
 - IMAP:
   . Fixed bug #72852 (imap_mail null dereference). (Anatol)

ext/gd/libgd/gd.c

@@ -2245,7 +2245,9 @@ void gdImageCopy (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX,
 			for (y = 0; (y < h); y++) {
 				for (x = 0; (x < w); x++) {
 					int c = gdImageGetTrueColorPixel (src, srcX + x, srcY + y);
-					gdImageSetPixel (dst, dstX + x, dstY + y, c);
+					if (c != src->transparent) {
+						gdImageSetPixel (dst, dstX + x, dstY + y, c);
+					}
 				}
 			}
 		} else {

ext/gd/tests/bug66005.phpt

@@ -0,0 +1,35 @@
+--TEST--
+Bug #66005 (imagecopy does not support 1bit transparency on truecolor images)
+--SKIPIF--
+<?php
+if (!extension_loaded('gd')) die('skip gd extension not available');
+?>
+--FILE--
+<?php
+$dest = imagecreatetruecolor(150, 50);
+$transparent = imagecolorallocatealpha($dest, 255, 255, 255, 127);
+imagealphablending($dest, false);
+imagefill($dest, 1, 1, $transparent);
+imagesavealpha($dest, true);
+
+// Palette image with transparent color
+$png_palette = imagecreatefromstring(base64_decode('iVBORw0KGgoAAAANSUhEUgAAADIAAAAyAgMAAABjUWAiAAAACVBMVEUAAAD/AAD///9nGWQeAAAAAXRSTlMAQObYZgAAAEFJREFUKM9jYBimIASZIxoagOAwhoaGInisQJ4DksJQJKWoPCAnNIQYHsgChBX4eMSbiddlqH5A9R+q39HCZWgDAFxFGyOrmguhAAAAAElFTkSuQmCCPHP'));
+
+// 24 bit with transparent color
+$png_24 = imagecreatefromstring(base64_decode('iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAABnRSTlMAAAAAAABupgeRAAAAVklEQVRYw+3UQQqAMBAEwf3/p9eTBxEPiWAmWMU8oGFJqgAAuOpzWTX3xQUti+uRJTZ9V5aY1bOTFZLV7yZr9zt6ibv/qPXfrMpsGipbIy7oqQ8AYJED1plDy5PCu2sAAAAASUVORK5CYII='));
+
+// 32 bit with full alpha channel
+$png_full = imagecreatefromstring(base64_decode('iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAXklEQVRo3u3XMQrAIBBFwb3/pU2VwiJNIvjdzMD2PlBwqwAAAGajatxz9OGf5viA+KA3EXExXyKiYlqErIiIiBGSFLIyYmuMkO7Xy2MX4ovS/ONoH7Eh/m1nBwCASBe3VYeVaAy8PwAAAABJRU5ErkJggg=='));
+
+imagecopy($dest, $png_palette, 0, 0, 0, 0, 50, 50);
+imagecopy($dest, $png_24, 50, 0, 0, 0, 50, 50);
+imagecopy($dest, $png_full, 100, 0, 0, 0, 50, 50);
+
+ob_start();
+imagegd($dest);
+echo md5(ob_get_clean()), PHP_EOL;
+?>
+==DONE==
+--EXPECT--
+9b36049de01006b367efd433f1689043
+==DONE==