cvs: php4 /ext/gd gd.c
| From: | Daniel Beulshausen | Date: | Fri, 20 Jul 2001 11:25:14 +0000 |
| Subject: | cvs: php4 /ext/gd gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6277@lists.php.net to get a copy of this message | ||
dbeu Fri Jul 20 07:25:14 2001 EDT
Modified files:
/php4/ext/gd gd.c
Log:
fix font handling in vdir mode
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.140 php4/ext/gd/gd.c:1.141
--- php4/ext/gd/gd.c:1.140 Sat Jul 14 08:59:46 2001
+++ php4/ext/gd/gd.c Fri Jul 20 07:25:13 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.140 2001/07/14 12:59:46 wez Exp $ */
+/* $Id: gd.c,v 1.141 2001/07/20 11:25:13 dbeu Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2754,9 +2754,15 @@
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