From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 6 Jan 2003 00:47:47 +0000 (+0000)
Subject: MFH
X-Git-Tag: PHP_4_3_before_13561_fix~121
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f600d3e481c922141a1a123e87f98c2161136e00;p=php

MFH
---

diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h
index d626cb165b..74201b7fd4 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 bc39f09c76..c98ce19cc3 100644
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -386,6 +386,12 @@ 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)
 	    {