fix wrong type and useless assignments

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 7dbd84da687f55a5ed4081d3bba50861cec6ae0e..ccbe3c136a32416d03bb6e9c0a546a74f2d43155 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -4238,7 +4238,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
@@ -4300,28 +4300,24 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
        {
                char tmp_font_path[MAXPATHLEN];
 
-               if (VCWD_REALPATH((char *)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((char *)fontname, "Invalid font filename");
+       PHP_GD_CHECK_OPEN_BASEDIR(fontname, "Invalid font filename");
        
 #ifdef USE_GD_IMGSTRTTF
 # if HAVE_GD_STRINGFTEX
        if (extended) {
-               error = gdImageStringFTEx(im, brect, col, (char *)fontname, ptsize, angle, x, y, (char *)str, &strex);
+               error = gdImageStringFTEx(im, brect, col, fontname, ptsize, angle, x, y, str, &strex);
        }
        else
 # endif
 
 # if HAVE_GD_STRINGFT
-       error = gdImageStringFT(im, brect, col, (char *)fontname, ptsize, angle, x, y, (char *)str);
+       error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str);
 # elif HAVE_GD_STRINGTTF
        error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str);
 # endif