fix wrong type and useless assignments

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index ef9e3cdd0fc8bf68bb6e06dfef3ba3f5f3e61967..0b3dab4f8b593a1f622769d759d2b66133c35d57 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -3588,7 +3588,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
        long col = -1, x = -1, y = -1;
        int str_len, fontname_len, i, brect[8];
        double ptsize, angle;
-       unsigned char *str = NULL, *fontname = NULL;
+       char *str = NULL, *fontname = NULL;
        char *error = NULL;
        int argc = ZEND_NUM_ARGS();
 #if HAVE_GD_STRINGFTEX
@@ -3657,14 +3657,10 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
        {
                char tmp_font_path[MAXPATHLEN];
 
-               if (VCWD_REALPATH(fontname, tmp_font_path)) {
-                       fontname = (unsigned char *) fontname;
-               } else {
+               if (!VCWD_REALPATH(fontname, tmp_font_path)) {
                        fontname = NULL;
                }
        }
-#else
-       fontname = (unsigned char *) fontname;
 #endif
 
        PHP_GD_CHECK_OPEN_BASEDIR(fontname, "Invalid font filename");