From: foobar <sniper@php.net>
Date: Fri, 14 Jan 2005 23:08:48 +0000 (+0000)
Subject: MFH: - Fixed bug #31060 (imageftbbox() does not use linespacing parameter)
X-Git-Tag: php-4.3.11RC1~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9da89ef290bd3bfe32b8ac94ca5b5289a6d480b;p=php

MFH: - Fixed bug #31060 (imageftbbox() does not use linespacing parameter)
---

diff --git a/NEWS b/NEWS
index d905c5bbf6..999bc98f8a 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ PHP 4                                                                      NEWS
 - Fixed bug #31101 (missing kerberos header file path with --with-openssl). (Jani)
 - Fixed bug #31072 (var_export() does not output an array element with an empty
   string key). (Derick)
+- Fixed bug #31060 (imageftbbox() does not use linespacing parameter). (Jani)
 - Fixed bug #31056 (php_std_date() returns invalid formatted date if 
   y2k_compliance is On). (Ilia)
 - Fixed bug #31055 (apache2filter: per request leak proportional to the full
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 9f7cff8f1e..34ad32727a 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -3033,9 +3033,10 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
 		col = Z_LVAL_PP(COL);
 		y = Z_LVAL_PP(Y);
 		x = Z_LVAL_PP(X);
+	}
 
 #if HAVE_GD_STRINGFTEX
-		if (EXT)	{
+		if (extended && EXT) {
 			/* parse extended info */
 
 			HashPosition pos;
@@ -3065,8 +3066,6 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
 		}
 #endif
 
-	}
-
 	ptsize = Z_DVAL_PP(PTSIZE);
 	angle = Z_DVAL_PP(ANGLE) * (M_PI/180); /* convert to radians */