cvs: gd(GD_2_0) /libgd NEWS gd.h gdft.c

scottmac		Thu Apr 19 12:54:57 2007 UTC

  Modified files:              (Branch: GD_2_0)
    /gd/libgd	NEWS gd.h gdft.c 
  Log:
  #73, Fix usage of TTF on Netware
  
http://cvs.php.net/viewvc.cgi/gd/libgd/NEWS?r1=1.4.2.13&r2=1.4.2.14&diff_format=u
Index: gd/libgd/NEWS
diff -u gd/libgd/NEWS:1.4.2.13 gd/libgd/NEWS:1.4.2.14
--- gd/libgd/NEWS:1.4.2.13	Sat Apr 14 17:41:51 2007
+++ gd/libgd/NEWS	Thu Apr 19 12:54:56 2007
@@ -1,4 +1,4 @@
-GD 2.0.35RC1 (2007-02-27)
+GD 2.0.35RC3 (2007-04-??)
 41, Fix valgrind error in gdImageFillTiled (Nuno Lopes) 
 45, Add missing custom cmake macros (required for the tests suite)
 51, Avoid signature buffer copy  in gd_gif_c (Nuno Lopes)
@@ -12,6 +12,7 @@
 70, GIF, do not try to use the global colmap if it does not exist
     (Nuno Lopes, Pierre)
 72, gdImageAALine draws axis lines with two pixels width
+73, TTF usage doesn't work properly on Netware (Guenter Knauf, Scott MacVicar)
 74, gdImageArc CPU usage with large angles
 
 GD 2.0.34 (2007-02-07)
http://cvs.php.net/viewvc.cgi/gd/libgd/gd.h?r1=1.34.2.3&r2=1.34.2.4&diff_format=u
Index: gd/libgd/gd.h
diff -u gd/libgd/gd.h:1.34.2.3 gd/libgd/gd.h:1.34.2.4
--- gd/libgd/gd.h:1.34.2.3	Mon Feb 26 23:39:43 2007
+++ gd/libgd/gd.h	Thu Apr 19 12:54:56 2007
@@ -62,6 +62,11 @@
 #endif
 
 /* some might want to set DEFAULT_FONTPATH from configure in config.h */
+#ifdef NETWARE
+/* default fontpath for netware systems, could probably be handled in configure for 2.1 */
+#define DEFAULT_FONTPATH "sys:/java/nwgfx/lib/x11/fonts/ttf;."
+#define PATHSEPARATOR ";"
+#endif
 
 /* 2.0.23: more Type 1 fonts */
 #ifndef DEFAULT_FONTPATH
http://cvs.php.net/viewvc.cgi/gd/libgd/gdft.c?r1=1.28.2.6&r2=1.28.2.7&diff_format=u
Index: gd/libgd/gdft.c
diff -u gd/libgd/gdft.c:1.28.2.6 gd/libgd/gdft.c:1.28.2.7
--- gd/libgd/gdft.c:1.28.2.6	Tue Apr  3 16:38:11 2007
+++ gd/libgd/gdft.c	Thu Apr 19 12:54:56 2007
@@ -1582,9 +1582,14 @@
       fullname = gdRealloc (fullname,
                           strlen (fontsearchpath) + strlen (name) + 8);
       /* if name is an absolute or relative pathname then test directly */
+#ifdef NETWARE
+      /* netware uses the format "volume:/path" or the standard "/path" */
+      if (name[0] != 0 && (strstr(name, ":/") || name[0] == '/'))
+#else
       if (strchr (name, '/')
 	  || (name[0] != 0 && name[1] == ':'
 	      && (name[2] == '/' || name[2] == '\\')))
+#endif
 	{
 	  sprintf (fullname, "%s", name);
 	  if (access (fullname, R_OK) == 0)