From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 19 Sep 2016 23:25:08 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.12RC1~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba2d9e1ff112f783cb930eaff5a2ecbc358421df;p=php

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

ba2d9e1ff112f783cb930eaff5a2ecbc358421df
diff --cc ext/gd/gd.c
index e6ff62036b,192aed0af4..4202de9f15
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -3856,9 -3854,8 +3856,9 @@@ static void php_imagettftext_common(INT
  {
  	zval *IM, *EXT = NULL;
  	gdImagePtr im=NULL;
- 	zend_long col = -1, x = -1, y = -1;
 -	long col = -1, x = 0, y = 0;
 -	int str_len, fontname_len, i, brect[8];
++	zend_long col = -1, x = 0, y = 0;
 +	size_t str_len, fontname_len;
 +	int i, brect[8];
  	double ptsize, angle;
  	char *str = NULL, *fontname = NULL;
  	char *error = NULL;