From a819cbc8691e7c0ce00b56bfd9e41cc0f7cc2732 Mon Sep 17 00:00:00 2001 From: foobar Date: Fri, 14 Jan 2005 23:08:02 +0000 Subject: [PATCH] MFH: - Fixed bug #31060 (imageftbbox() does not use linespacing parameter) --- NEWS | 1 + ext/gd/gd.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index d306bbb6d2..08b5177d71 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,7 @@ PHP NEWS - Fixed bug #31087 (broken php_url_encode_hash macro). (Ilia) - 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 f099f1b2bd..a96a453b7f 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -3150,9 +3150,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; @@ -3184,8 +3185,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 */ -- 2.50.1