cvs: php4(PHP_4_3) /ext/gd/libgd gd.h gdft.c
| From: | Ilia Alshanetsky | Date: | Mon, 06 Jan 2003 00:47:47 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/gd/libgd gd.h gdft.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17650@lists.php.net to get a copy of this message | ||
iliaa Sun Jan 5 19:47:47 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/gd/libgd gd.h gdft.c
Log:
MFH
Index: php4/ext/gd/libgd/gd.h
diff -u php4/ext/gd/libgd/gd.h:1.7.2.1 php4/ext/gd/libgd/gd.h:1.7.2.2
--- php4/ext/gd/libgd/gd.h:1.7.2.1 Wed Dec 4 16:07:09 2002
+++ php4/ext/gd/libgd/gd.h Sun Jan 5 19:47:47 2003
@@ -7,11 +7,11 @@
#ifndef WIN32
/* default fontpath for unix systems */
-#define DEFAULT_FONTPATH
"/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1"
+#define DEFAULT_FONTPATH
"/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/truetype:/usr/X11R6/lib/X11/fonts/TTF:/usr/share/fonts/TrueType:/usr/share/fonts/truetype:/usr/openwin/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/Type1:."
#define PATHSEPARATOR ":"
#else
/* default fontpath for windows systems */
-#define DEFAULT_FONTPATH "c:\\winnt\\fonts"
+#define DEFAULT_FONTPATH "c:\\winnt\\fonts;."
#define PATHSEPARATOR ";"
#endif
Index: php4/ext/gd/libgd/gdft.c
diff -u php4/ext/gd/libgd/gdft.c:1.11.2.3 php4/ext/gd/libgd/gdft.c:1.11.2.4
--- php4/ext/gd/libgd/gdft.c:1.11.2.3 Mon Nov 18 08:00:52 2002
+++ php4/ext/gd/libgd/gdft.c Sun Jan 5 19:47:47 2003
@@ -386,6 +386,12 @@
for (dir = strtok (path, PATHSEPARATOR); dir;
dir = strtok (0, PATHSEPARATOR))
{
+ sprintf (fullname, "%s/%s", dir, name);
+ if (access (fullname, R_OK) == 0)
+ {
+ font_found++;
+ break;
+ }
sprintf (fullname, "%s/%s.ttf", dir, name);
if (access (fullname, R_OK) == 0)
{