]> granicus.if.org Git - php/commitdiff
fix font handling in vdir mode
authorDaniel Beulshausen <dbeu@php.net>
Fri, 20 Jul 2001 11:25:13 +0000 (11:25 +0000)
committerDaniel Beulshausen <dbeu@php.net>
Fri, 20 Jul 2001 11:25:13 +0000 (11:25 +0000)
ext/gd/gd.c

index 6c6180c1292fbce9befa4549d2553943fde41f0c..7850800b42172ec0d916c76d21a185b3a494d29d 100644 (file)
@@ -2754,9 +2754,15 @@ void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int extende
 
        str = (unsigned char *) Z_STRVAL_PP(C);
        l = strlen(str);
-       fontname = (unsigned char *) Z_STRVAL_PP(FONTNAME);
 
-       
+#ifdef VIRTUAL_DIR
+       if(virtual_filepath(Z_STRVAL_PP(FONTNAME), &fontname)) {
+               fontname = (unsigned char*)Z_STRVAL_PP(FONTNAME);
+       }
+#else
+       fontname = (unsigned char*)Z_STRVAL_PP(FONTNAME);
+#endif
+
 #ifdef USE_GD_IMGSTRTTF
 # if HAVE_LIBFREETYPE