diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-01-06 00:47:40 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-01-06 00:47:40 +0000 |
| commit | b52eb8f14a861934a0daa1668d1f46fbaa4c78c6 (patch) | |
| tree | 361685124c66d224303afb96ddd0e340de2b4bc5 | |
| parent | 7dae4000634503038bb9411c948a1f77080b301f (diff) | |
| download | php-git-b52eb8f14a861934a0daa1668d1f46fbaa4c78c6.tar.gz | |
Fixed bug #21445.
| -rw-r--r-- | ext/gd/libgd/gd.h | 4 | ||||
| -rw-r--r-- | ext/gd/libgd/gdft.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h index 4cf7078635..b3a5045ac8 100644 --- a/ext/gd/libgd/gd.h +++ b/ext/gd/libgd/gd.h @@ -7,11 +7,11 @@ extern "C" { #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 diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c index 746613e438..eb6832da0b 100644 --- a/ext/gd/libgd/gdft.c +++ b/ext/gd/libgd/gdft.c @@ -398,6 +398,11 @@ static void *fontFetch (char **error, void *key) } } 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) { font_found++; |