From 09eb6ed35eb5b0d164aa9fbad52dd8d873166294 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 14 Sep 2016 14:59:17 +0200
Subject: [PATCH] Fix #50194: imagettftext broken on transparent background w/o
 alphablending

We must not draw the background pixels of the character glyphs, what has
already been fixed in GD 2.0.26.
---
 NEWS                       |   2 ++
 ext/gd/libgd/gdft.c        |   2 ++
 ext/gd/tests/bug50194.phpt |  29 +++++++++++++++++++++++++++++
 ext/gd/tests/bug50194.png  | Bin 0 -> 2827 bytes
 4 files changed, 33 insertions(+)
 create mode 100644 ext/gd/tests/bug50194.phpt
 create mode 100644 ext/gd/tests/bug50194.png

diff --git a/NEWS b/NEWS
index b7f466dc2eb..61f96093d68 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ PHP                                                                        NEWS
 - GD:
   . Fixed bug #67325 (imagetruecolortopalette: white is duplicated in palette).
     (cmb)
+  . Fixed bug #50194 (imagettftext broken on transparent background w/o
+    alphablending). (cmb)
 
 - Mbstring:
   . Fixed bug #72994 (mbc_to_code() out of bounds read). (Laruence, cmb)
diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index ba905dc0a86..be9ae6177b5 100644
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -659,6 +659,8 @@ static char * gdft_draw_bitmap (gdCache_head_t *tc_cache, gdImage * im, int fg,
 				} else {
 					return "Unsupported ft_pixel_mode";
 				}
+				if (level == 0)  /* if background */
+					continue;
 				if ((fg >= 0) && (im->trueColor)) {
 					/* Consider alpha in the foreground color itself to be an
 					 * upper bound on how opaque things get, when truecolor is
diff --git a/ext/gd/tests/bug50194.phpt b/ext/gd/tests/bug50194.phpt
new file mode 100644
index 00000000000..91b7b351390
--- /dev/null
+++ b/ext/gd/tests/bug50194.phpt
@@ -0,0 +1,29 @@
+--TEST--
+Bug #50194 (imagettftext broken on transparent background w/o alphablending)
+--SKIPIF--
+<?php
+if (!extension_loaded('gd')) die('skip gd extension not available');
+if (!function_exists('imagettftext')) die('skip imagettftext() not available');
+?>
+--FILE--
+<?php
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
+
+$im = imagecreatetruecolor(240, 55);
+$background = imagecolorallocatealpha($im, 60, 60, 60, 0); // no tranparency
+$black = imagecolorallocate($im, 0, 0, 0);
+imagealphablending($im, false); 
+imagefilledrectangle($im, 0, 0, 239, 54, $background);
+$text = 'Testing ... ';
+$font = __DIR__ . DIRECTORY_SEPARATOR . 'Tuffy.ttf';
+imagettftext($im, 40, 0, 10, 40, $black, $font, $text);
+imagesavealpha($im, true);
+
+test_image_equals_file(__DIR__ . DIRECTORY_SEPARATOR . 'bug50194.png', $im);
+
+imagedestroy($im);
+?>
+===DONE===
+--EXPECT--
+The images are equal.
+===DONE===
diff --git a/ext/gd/tests/bug50194.png b/ext/gd/tests/bug50194.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bbf5babae960c265a6d524b0bfd4c0a41047a29
GIT binary patch
literal 2827
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

literal 0
HcmV?d00001