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

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index dd9e6c5db74f80db49251089e8e7335e572c3a29..aa7c51bbade982fed59a3a7ad719936b0eae9a19 100644 (file)
--- 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 */