34 files changed, 579 insertions, 154 deletions

diff --git a/src/configure b/src/configure
index 216e55b..7dc8f9a 100755
--- a/src/configure
+++ b/src/configure
@@ -3,15 +3,18 @@
 #Frequently Changed Settings
 
 #Correct include directories for freetype, zlib, libpng, XPM, JPEG, etc. 
-#If your include directories are different, add them here.
+#If your include directories are different, add them here. *Extra*
+#directories that don't happen to exist on your system shouldn't
+#cause an error (if they do, let me know).
 
-$includeDirs = "-I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include"; 
+$includeDirs = "-I/usr/include/freetype2 -I/usr/local/include/freetype2 " .
+	"-I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include";
 
-#Typical install locations for freetype, zlib, xpm and libpng libraries.
+#Typical install locations for freetype, zlib, Xpm and libpng libraries.
 #If yours are somewhere else, other than a standard location
 #such as /lib or /usr/lib, then change this. This line shouldn't hurt 
 #if you don't actually have some of the optional libraries and directories.
-$libDirs = "-L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib";
+$libDirs = "-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/local/lib";
 
 #If you don't have gcc, get it. If you really must, you can change this; 
 #but if you do, you must specify not only your compiler but options 
@@ -58,6 +61,7 @@ if ($os =~ /^(linux|irix|tru64|ultrix|openbsd|netbsd|freebsd)/i) {
 } elsif ($os =~ /^(sunos)/i) {
 	$sharedLinkHead = "/usr/ccs/bin/ld -G";
 	$sharedLinkTail = "-ldl";
+	$socketLibForXpm = 1;
 	print "Found OS with sunos-like shared library link command\n";
 } elsif ($os =~ /^(darwin)/i) {
 	$sharedLinkHead = "ld -dynamic -flat_namespace -undefined suppress";
@@ -101,11 +105,24 @@ if (&testLibrary("freetype", "FT_Init_FreeType(0)")) {
 	print "Warning: freetype 2.x library not found, freetype will not be supported.\n";
 }
 
-if (&testLibrary("xpm", "XpmReadFileToXpmImage(0, 0, 0)")) {
-	push @options, "xpm";
-	print "xpm library found.\n";
+#2.0.4 thanks to Len Makin: need optional libraries and uppercase X,
+#also -lsocket under Solaris
+
+if ($socketLibNeededForXpm) {
+	$xpmLibs = "-lX11 -lsocket";
 } else {
-	print "xpm library not found. That's OK. Almost no one needs xpm in gd.\n";
+	$xpmLibs = "-lX11";
+}
+
+if (&testLibrary("Xpm", "XpmReadFileToXpmImage(0, 0, 0)", $xpmLibs)) {
+	push @options, "Xpm";
+	push @options, "X11";
+	if ($socketLibNeededForXpm) {
+		push @options, "socket";
+	}
+	print "Xpm library found.\n";
+} else {
+	print "Xpm library not found. That's OK. Almost no one needs Xpm in gd.\n";
 }
 
 for $o (@options) {
@@ -185,7 +202,7 @@ INSTALL_BIN=$installPrefix/bin
 # Update these with each release!
 
 MAJOR_VERSION=2
-VERSION=2.0.3
+VERSION=2.0.4
 
 COMPILER=$compiler
 
@@ -194,7 +211,7 @@ LINK=\$(CC) \$(LIBDIRS) \$(LIBS)
 
 PROGRAMS=$safePrograms \$(TEST_PROGRAMS)
 
-TEST_PROGRAMS=gdtest gddemo gd2time gdtestft testac
+TEST_PROGRAMS=gdtest gddemo gd2time gdtestft testac fontwheeltest fontsizetest
 
 default: instructions
 
@@ -269,6 +286,12 @@ gd2time: gd2time.o
 gdtestft: gdtestft.o
 	\$(CC) --verbose gdtestft.o -o gdtestft \$(LIBDIRS) \$(LIBS)
 
+fontwheeltest: fontwheeltest.o
+	\$(CC) --verbose fontwheeltest.o -o fontwheeltest \$(LIBDIRS) \$(LIBS)
+
+fontsizetest: fontsizetest.o
+	\$(CC) --verbose fontsizetest.o -o fontsizetest \$(LIBDIRS) \$(LIBS)
+
 LIBOBJS=gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \\
 		gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o \\
 		gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \\
@@ -299,7 +322,7 @@ libgd.a: \${LIBOBJS}
 	-ranlib libgd.a
 
 clean:
-	rm -f *.o *.a *.so *.so.* \${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp test/fttest.png test/fttest.jpg *test.errors
+	rm -f *.o *.a *.so *.so.* \${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp test/fttest.png test/fttest.jpg *test.errors font*test?.png
 veryclean: clean
 	rm Makefile
 EOM
diff --git a/src/err.out b/src/err.out
new file mode 100644
index 0000000..90bbb64
--- /dev/null
+++ b/src/err.out
@@ -0,0 +1,16 @@
+------------- New fontwheel --------------
+times
+.....Hello, there!
+------------------------------------------
+------------- New fontwheel --------------
+times
+.....Hello, there!
+------------------------------------------
+------------- New fontwheel --------------
+arial
+.....Hello, there!
+------------------------------------------
+------------- New fontwheel --------------
+arial
+.....Hello, there!
+------------------------------------------
diff --git a/src/fontsizetest.c b/src/fontsizetest.c
new file mode 100644
index 0000000..52c5211
--- /dev/null
+++ b/src/fontsizetest.c
@@ -0,0 +1,86 @@
+#include "gd.h"
+
+void dosizes(gdImagePtr im, int color, char *fontfile,
+             int x, int y, const char *string)
+{
+  int brect[8];
+  double curang = 0.0;
+  char *cp;
+  int cursize;
+  char buf[60];
+
+  for (cursize = 1; cursize <= 20; cursize++) 
+  {
+      sprintf(buf,"%d: %s", cursize, string);
+
+  /* The case of newlines is taken care of in the gdImageStringTTF call */
+#if defined(OLDER_GD)
+      cp = gdImageStringTTF (im, brect, color, fontfile, cursize, curang, x, y, buf);
+#else
+      cp = gdImageStringFT  (im, brect, color, fontfile, cursize, curang, x, y, buf);
+#endif
+    if (cp)
+      fprintf(stderr, "%s\n", cp);
+    y += cursize + 4;
+
+/* render the same fontsize with antialiasing turned off */
+#if defined(OLDER_GD)
+      cp = gdImageStringTTF (im, brect, 0-color, fontfile, cursize, curang, x, y, buf);
+#else
+      cp = gdImageStringFT  (im, brect, 0-color, fontfile, cursize, curang, x, y, buf);
+#endif
+    if (cp)
+      fprintf(stderr, "%s\n", cp);
+    y += cursize + 4;
+  }
+}
+
+void dotest(char *font, 
+ 	    int w, int h, char *string,
+            const char *filename)
+{
+  gdImagePtr im;
+  FILE *out;
+  int bg;
+  int fc;
+  int lc;
+
+  im = gdImageCreate(w, h);
+  bg = gdImageColorAllocate(im, 0, 0, 0);
+
+  gdImageFilledRectangle(im, 1, 1, w-1, h-1, bg);
+  
+  fc = gdImageColorAllocate(im, 255, 192, 192);
+  lc = gdImageColorAllocate(im, 192, 255, 255);
+
+  out = fopen(filename, "wb");
+
+  dosizes(im, fc, font, 20, 20, string);
+
+#if defined(HAVE_LIBPNG)
+  gdImagePng(im, out);
+#elif defined(HAVE_LIBJPEG)
+  gdImageJpeg(im, out, -1);
+#endif
+  fclose(out);
+}
+
+int main(int argc, char **argv)
+{
+
+#if defined(HAVE_LIBPNG)
+  dotest("times",     400, 600, ".....Hello, there!", "fontsizetest1.png");
+  dotest("cour",      400, 600, ".....Hello, there!", "fontsizetest2.png");
+  dotest("arial",     400, 600, ".....Hello, there!", "fontsizetest3.png");
+  dotest("luximr",   400, 600, ".....Hello, there!", "fontsizetest4.png");
+#elif defined(HAVE_LIBJPEG)
+  dotest("times",     400, 600, ".....Hello, there!", "fontsizetest1.jpeg");
+  dotest("cour",      400, 600, ".....Hello, there!", "fontsizetest2.jpeg");
+  dotest("arial",     400, 600, ".....Hello, there!", "fontsizetest3.jpeg");
+  dotest("luximr",   400, 600, ".....Hello, there!", "fontsizetest4.jpeg");
+#else
+  fprintf(stderr, "no PNG or JPEG support\n");
+#endif
+
+  return 0;
+}
diff --git a/src/fontwheeltest.c b/src/fontwheeltest.c
new file mode 100644
index 0000000..20f2263
--- /dev/null
+++ b/src/fontwheeltest.c
@@ -0,0 +1,111 @@
+#include <math.h>
+#include "gd.h"
+#define DEGTORAD(x) ( (x) * (2.0 * 3.14159265) / 360.0 )
+
+void doerr(FILE *err, const char *msg)
+{
+  if (err)
+  {
+    fprintf(err, "%s\n", msg);
+    fflush(err);
+  }
+}
+
+void dowheel(gdImagePtr im, int color, char *fontfile,
+             int fontsize, double angle, int x, int y, char *string)
+{
+  int brect[8];
+  FILE *err;
+  double curang;
+  char *cp;
+  
+  err = fopen("err.out", "a");
+  doerr(err, "------------- New fontwheel --------------");
+  doerr(err, fontfile);
+  doerr(err, string);
+  doerr(err, "------------------------------------------");
+
+  for (curang=0.0; curang < 360.0; curang += angle)
+  {
+  /* The case of newlines is taken care of in the gdImageStringTTF call */
+#if defined(OLDER_GD)
+      cp = gdImageStringTTF (im, brect, color, fontfile, fontsize, DEGTORAD(curang), x, y, string);
+#else
+      cp = gdImageStringFT  (im, brect, color, fontfile, fontsize, DEGTORAD(curang), x, y, string);
+#endif
+    if (cp)
+      doerr(err, cp);
+  }
+
+  fclose(err);
+}
+
+void dolines(gdImagePtr im, int color, double incr, int x, int y, int offset, int length)
+{
+  double curang;
+  double angle;
+  double x0, x1, y0, y1;
+  for (curang=0.0; curang < 360.0; curang += incr )
+  {
+    angle = curang * (2.0 * 3.14159265) / 360.0;
+    x0 = cos(angle)*offset + x;
+    x1 = cos(angle)*(offset+length) + x;
+    y0 = sin(angle)*offset + y;
+    y1 = sin(angle)*(offset+length) + y;
+    gdImageLine(im, x0, y0, x1, y1, color);
+  }
+}
+
+void dotest(char *font, int size, double incr, 
+ 	    int w, int h, char *string,
+            const char *filename)
+{
+  gdImagePtr im;
+  FILE *out;
+  int bg;
+  int fc;
+  int lc;
+  int xc = w / 2;
+  int yc = h / 2;
+
+  im = gdImageCreate(w, h);
+  bg = gdImageColorAllocate(im, 0, 0, 0);
+
+  gdImageFilledRectangle(im, 1, 1, w-1, h-1, bg);
+  
+  fc = gdImageColorAllocate(im, 255, 192, 192);
+  lc = gdImageColorAllocate(im, 192, 255, 255);
+
+  out = fopen(filename, "wb");
+
+  dowheel(im, fc, font, size, incr, xc, yc, string);
+  dolines(im, lc, incr, xc, yc, 20, 120);
+
+#if defined(HAVE_LIBPNG)
+  gdImagePng(im, out);
+#elif defined(HAVE_LIBJPEG)
+  gdImageJpeg(im, out, -1);
+#endif
+
+  fclose(out);
+}
+
+int main(int argc, char **argv)
+{
+
+#if defined(HAVE_LIBPNG)
+  dotest("times", 16, 20.0, 400, 400, ".....Hello, there!", "fontwheeltest1.png");
+  dotest("times", 16, 30.0, 400, 400, ".....Hello, there!", "fontwheeltest2.png");
+  dotest("arial", 16, 45.0, 400, 400, ".....Hello, there!", "fontwheeltest3.png");
+  dotest("arial", 16, 90.0, 400, 400, ".....Hello, there!", "fontwheeltest4.png");
+#elif defined(HAVE_LIBJPEG)
+  dotest("times", 16, 20.0, 400, 400, ".....Hello, there!", "fontwheeltest1.jpeg");
+  dotest("times", 16, 30.0, 400, 400, ".....Hello, there!", "fontwheeltest2.jpeg");
+  dotest("arial", 16, 45.0, 400, 400, ".....Hello, there!", "fontwheeltest3.jpeg");
+  dotest("arial", 16, 90.0, 400, 400, ".....Hello, there!", "fontwheeltest4.jpeg");
+#else
+  fprintf(stderr, "no PNG or JPEG support\n");
+#endif
+
+  return 0;
+}
diff --git a/src/gd.c b/src/gd.c
index 0b0bf54..a1c62d5 100644
--- a/src/gd.c
+++ b/src/gd.c
@@ -59,6 +59,7 @@ extern int gdSinT[];
 
 static void gdImageBrushApply (gdImagePtr im, int x, int y);
 static void gdImageTileApply (gdImagePtr im, int x, int y);
+static int gdImageGetTrueColorPixel(gdImagePtr im, int x, int y);
 
 gdImagePtr
 gdImageCreate (int sx, int sy)
@@ -296,6 +297,7 @@ HWB_Diff (int r1, int g1, int b1, int r2, int g2, int b2)
 }
 
 
+#if 0
 /*
  * This is not actually used, but is here for completeness, in case someone wants to
  * use the HWB stuff for anything else...
@@ -340,6 +342,7 @@ HWB_to_RGB (HWBType HWB, RGBType * RGB)
   return RGB;
 
 }
+#endif
 
 int
 gdImageColorClosestHWB (gdImagePtr im, int r, int g, int b)
@@ -479,6 +482,12 @@ gdImageColorResolveAlpha (gdImagePtr im, int r, int g, int b, int a)
 	  op = c;		/* Save open slot */
 	  continue;		/* Color not in use */
 	}
+      if (c == im->transparent)
+        {
+          /* don't ever resolve to the color that has
+           * been designated as the transparent color */
+          continue;
+	}
       rd = (long) (im->red[c] - r);
       gd = (long) (im->green[c] - g);
       bd = (long) (im->blue[c] - b);
@@ -754,6 +763,7 @@ gdImageTileApply (gdImagePtr im, int x, int y)
     }
   else
     {
+      p = gdImageGetPixel(im->tile, srcx, srcy);
       /* Allow for transparency */
       if (p != gdImageGetTransparent (im->tile))
 	{
@@ -798,7 +808,7 @@ gdImageGetPixel (gdImagePtr im, int x, int y)
     }
 }
 
-int
+static int
 gdImageGetTrueColorPixel (gdImagePtr im, int x, int y)
 {
   int p = gdImageGetPixel (im, x, y);
@@ -973,7 +983,7 @@ gdImageDashedLine (gdImagePtr im, int x1, int y1, int x2, int y2, int color)
   int dashStep = 0;
   int on = 1;
   int wid;
-  int w, wstart, vert;
+  int vert;
   int thick = im->thick;
 
   dx = abs (x2 - x1);
@@ -1303,7 +1313,7 @@ gdImageFilledArc (gdImagePtr im, int cx, int cy, int w, int h, int s, int e, int
   gdPoint pts[3];
   int i;
   int lx = 0, ly = 0;
-  int fx, fy;
+  int fx = 0, fy = 0;
   int w2, h2;
   w2 = w / 2;
   h2 = h / 2;
@@ -1883,7 +1893,7 @@ gdImageCopyResized (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX
 	  tox = dstX;
 	  for (x = srcX; (x < (srcX + srcW)); x++)
 	    {
-	      int nc;
+	      int nc = 0;
 	      int mapTo;
 	      if (!stx[x - srcX])
 		{
@@ -1891,7 +1901,6 @@ gdImageCopyResized (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX
 		}
 	      if (dst->trueColor)
 		{
-		  int d;
 		  mapTo = gdImageGetTrueColorPixel (src, x, y);
 		  /* Added 7/24/95: support transparent copies */
 		  if (gdImageGetTransparent (src) == mapTo)
@@ -1971,7 +1980,6 @@ gdImageCopyResampled (gdImagePtr dst,
 		      int srcW, int srcH)
 {
   int x, y;
-  float sx, sy;
   if (!dst->trueColor)
     {
       gdImageCopyResized (
@@ -1983,7 +1991,6 @@ gdImageCopyResampled (gdImagePtr dst,
     {
       for (x = dstX; (x < dstX + dstW); x++)
 	{
-	  int pd = gdImageGetPixel (dst, x, y);
 	  float sy1, sy2, sx1, sx2;
 	  float sx, sy;
 	  float spixels = 0;
diff --git a/src/gd.h b/src/gd.h
index 5ffe796..1262dcb 100644
--- a/src/gd.h
+++ b/src/gd.h
@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-/* default fontpath for unix systems */
-#define DEFAULT_FONTPATH "/usr/share/fonts/truetype"
+/* default fontpath for unix systems  - whatever happened to standards ! */
+#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 ":"
 
 /* gd.h: declarations file for the graphic-draw module.
@@ -243,6 +243,9 @@ void gdImageStringUp(gdImagePtr im, gdFontPtr f, int x, int y, unsigned char *s,
 void gdImageString16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
 void gdImageStringUp16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
 
+/* clean up after using fonts in gdImageStringFT() */
+void gdFreeFontCache();
+
 /* Calls gdImageStringFT. Provided for backwards compatibility only. */
 char *gdImageStringTTF(gdImage *im, int *brect, int fg, char *fontlist,
                 double ptsize, double angle, int x, int y, char *string);
diff --git a/src/gd2topng.c b/src/gd2topng.c
index c898f25..6db5eb3 100644
--- a/src/gd2topng.c
+++ b/src/gd2topng.c
@@ -37,7 +37,11 @@ main (int argc, char **argv)
       gdImageDestroy (im);
       exit (1);
     }
+#ifdef HAVE_LIBPNG
   gdImagePng (im, out);
+#else
+  fprintf(stderr, "No PNG library support available.\n");
+#endif
   fclose (out);
   gdImageDestroy (im);
 
diff --git a/src/gd_gd.c b/src/gd_gd.c
index 45b6492..53b1c71 100644
--- a/src/gd_gd.c
+++ b/src/gd_gd.c
@@ -147,7 +147,7 @@ gdImageCreateFromGd (FILE * inFile)
   in = gdNewFileCtx (inFile);
   im = gdImageCreateFromGdCtx (in);
 
-  in->free (in);
+  in->gd_free (in);
 
   return im;
 }
@@ -195,7 +195,6 @@ void
 _gdPutColors (gdImagePtr im, gdIOCtx * out)
 {
   int i;
-  int trans;
 
   gdPutC (im->trueColor, out);
   if (!im->trueColor)
@@ -257,7 +256,7 @@ gdImageGd (gdImagePtr im, FILE * outFile)
 {
   gdIOCtx *out = gdNewFileCtx (outFile);
   _gdImageGd (im, out);
-  out->free (out);
+  out->gd_free (out);
 }
 
 void *
@@ -267,6 +266,6 @@ gdImageGdPtr (gdImagePtr im, int *size)
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
   _gdImageGd (im, out);
   rv = gdDPExtractData (out, size);
-  out->free (out);
+  out->gd_free (out);
   return rv;
 }
diff --git a/src/gd_gd2.c b/src/gd_gd2.c
index 26e87c8..3adbe50 100644
--- a/src/gd_gd2.c
+++ b/src/gd_gd2.c
@@ -10,18 +10,20 @@
    *
  */
 
-/* 2.03: gd2 is no longer mandatory */
-#ifdef HAVE_LIBZ
-
 #include <stdio.h>
 #include <errno.h>
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
-#include <zlib.h>
 #include "gd.h"
 #include "gdhelpers.h"
 
+/* 2.03: gd2 is no longer mandatory */
+/* JCE - test after including gd.h so that HAVE_LIBZ can be set in
+ * a config.h file included by gd.h */
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+
 #define TRUE 1
 #define FALSE 0
 
@@ -253,7 +255,7 @@ gdImageCreateFromGd2 (FILE * inFile)
 
   im = gdImageCreateFromGd2Ctx (in);
 
-  in->free (in);
+  in->gd_free (in);
 
   return im;
 }
@@ -265,14 +267,14 @@ gdImageCreateFromGd2Ctx (gdIOCtxPtr in)
   int i;
   int ncx, ncy, nc, cs, cx, cy;
   int x, y, ylo, yhi, xlo, xhi;
-  int ch, vers, fmt;
+  int vers, fmt;
   t_chunk_info *chunkIdx = NULL;	/* So we can gdFree it with impunity. */
   unsigned char *chunkBuf = NULL;	/* So we can gdFree it with impunity. */
   int chunkNum = 0;
-  int chunkMax;
+  int chunkMax = 0;
   uLongf chunkLen;
-  int chunkPos;
-  int compMax;
+  int chunkPos = 0;
+  int compMax = 0;
   int bytesPerPixel;
   char *compBuf = NULL;		/* So we can gdFree it with impunity. */
 
@@ -436,7 +438,7 @@ gdImageCreateFromGd2Part (FILE * inFile, int srcx, int srcy, int w, int h)
 
   im = gdImageCreateFromGd2PartCtx (in, srcx, srcy, w, h);
 
-  in->free (in);
+  in->gd_free (in);
 
   return im;
 }
@@ -453,9 +455,9 @@ gdImageCreateFromGd2PartCtx (gdIOCtx * in, int srcx, int srcy, int w, int h)
   t_chunk_info *chunkIdx = NULL;
   char *chunkBuf = NULL;
   int chunkNum;
-  int chunkMax;
+  int chunkMax = 0;
   uLongf chunkLen;
-  int chunkPos;
+  int chunkPos = 0;
   int compMax;
   char *compBuf = NULL;
 
@@ -638,10 +640,10 @@ gdImageCreateFromGd2PartCtx (gdIOCtx * in, int srcx, int srcy, int w, int h)
 		    {
 		      if (im->trueColor)
 			{
-			  ch = chunkBuf[chunkPos++] << 24 +
-			    chunkBuf[chunkPos++] << 16 +
-			    chunkBuf[chunkPos++] << 8 +
-			    chunkBuf[chunkPos++];
+                          ch = chunkBuf[chunkPos++];
+                          ch = (ch << 8) + chunkBuf[chunkPos++];
+                          ch = (ch << 8) + chunkBuf[chunkPos++];
+                          ch = (ch << 8) + chunkBuf[chunkPos++];
 			}
 		      else
 			{
@@ -713,12 +715,12 @@ _gdImageGd2 (gdImagePtr im, gdIOCtx * out, int cs, int fmt)
   char *chunkData = NULL;	/* So we can gdFree it with impunity. */
   char *compData = NULL;	/* So we can gdFree it with impunity. */
   uLongf compLen;
-  int idxPos;
+  int idxPos = 0;
   int idxSize;
   t_chunk_info *chunkIdx = NULL;
   int posSave;
   int bytesPerPixel = im->trueColor ? 4 : 1;
-  int compMax;
+  int compMax = 0;
 
   /*printf("Trying to write GD2 file\n"); */
 
@@ -911,7 +913,7 @@ gdImageGd2 (gdImagePtr im, FILE * outFile, int cs, int fmt)
 {
   gdIOCtx *out = gdNewFileCtx (outFile);
   _gdImageGd2 (im, out, cs, fmt);
-  out->free (out);
+  out->gd_free (out);
 }
 
 void *
@@ -921,9 +923,22 @@ gdImageGd2Ptr (gdImagePtr im, int cs, int fmt, int *size)
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
   _gdImageGd2 (im, out, cs, fmt);
   rv = gdDPExtractData (out, size);
-  out->free (out);
+  out->gd_free (out);
   return rv;
 }
 
+#else /* no HAVE_LIBZ */
+gdImagePtr
+gdImageCreateFromGd2 (FILE * inFile)
+{
+  fprintf(stderr,"GD2 support is not available - no libz\n");
+  return NULL;
+}
+gdImagePtr
+gdImageCreateFromGd2Ctx (gdIOCtxPtr in)
+{
+  fprintf(stderr,"GD2 support is not available - no libz\n");
+  return NULL;
+}
 #endif /* HAVE_LIBZ */
 
diff --git a/src/gd_io.h b/src/gd_io.h
index 5c0bd24..c28379a 100644
--- a/src/gd_io.h
+++ b/src/gd_io.h
@@ -13,7 +13,7 @@ typedef struct gdIOCtx {
 	int	(*seek)(struct gdIOCtx*, const int);
 	long	(*tell)(struct gdIOCtx*);
 
-	void    (*free)(struct gdIOCtx*);
+	void    (*gd_free)(struct gdIOCtx*);
 
 } gdIOCtx;
 
diff --git a/src/gd_io_dp.c b/src/gd_io_dp.c
index d28dfb0..c41743e 100644
--- a/src/gd_io_dp.c
+++ b/src/gd_io_dp.c
@@ -1,4 +1,3 @@
-
 /*
    * io_dp.c
    *
@@ -95,7 +94,7 @@ gdNewDynamicCtx (int initialSize, void *data)
   ctx->ctx.seek = dynamicSeek;
   ctx->ctx.tell = dynamicTell;
 
-  ctx->ctx.free = gdFreeDynamicCtx;
+  ctx->ctx.gd_free = gdFreeDynamicCtx;
 
   return (gdIOCtx *) ctx;
 }
diff --git a/src/gd_io_file.c b/src/gd_io_file.c
index d0efd1a..7136461 100644
--- a/src/gd_io_file.c
+++ b/src/gd_io_file.c
@@ -71,7 +71,7 @@ gdNewFileCtx (FILE * f)
   ctx->ctx.tell = fileTell;
   ctx->ctx.seek = fileSeek;
 
-  ctx->ctx.free = gdFreeFileCtx;
+  ctx->ctx.gd_free = gdFreeFileCtx;
 
   return (gdIOCtx *) ctx;
 }
diff --git a/src/gd_io_ss.c b/src/gd_io_ss.c
index 1ea78d5..dd96fdf 100644
--- a/src/gd_io_ss.c
+++ b/src/gd_io_ss.c
@@ -71,7 +71,7 @@ gdNewSSCtx (gdSourcePtr src, gdSinkPtr snk)
   ctx->ctx.tell = NULL;
   ctx->ctx.seek = NULL;
 
-  ctx->ctx.free = gdFreeSsCtx;
+  ctx->ctx.gd_free = gdFreeSsCtx;
 
   return (gdIOCtx *) ctx;
 }
diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c
index dc0d426..a0767c7 100644
--- a/src/gd_jpeg.c
+++ b/src/gd_jpeg.c
@@ -1,5 +1,3 @@
-
-
 /*
  * gd_jpeg.c: Read and write JPEG (JFIF) format image files using the
  * gd graphics library (http://www.boutell.com/gd/).
@@ -20,20 +18,21 @@
  * major CGI brain damage
  */
 
-/* TBB: move this up so include files are not brought in */
-#ifdef HAVE_LIBJPEG
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <setjmp.h>
 #include <limits.h>
 #include <string.h>
 
+#include "gd.h"
+/* TBB: move this up so include files are not brought in */
+/* JCE: arrange HAVE_LIBJPEG so that it can be set in gd.h */
+#ifdef HAVE_LIBJPEG
+#include "gdhelpers.h"
+
 /* 1.8.1: remove dependency on jinclude.h */
 #include "jpeglib.h"
 #include "jerror.h"
-#include "gd.h"
-#include "gdhelpers.h"
 
 static const char *const GD_JPEG_VERSION = "1.0";
 
@@ -85,7 +84,7 @@ gdImageJpeg (gdImagePtr im, FILE * outFile, int quality)
 {
   gdIOCtx *out = gdNewFileCtx (outFile);
   gdImageJpegCtx (im, out, quality);
-  out->free (out);
+  out->gd_free (out);
 }
 
 void *
@@ -95,7 +94,7 @@ gdImageJpegPtr (gdImagePtr im, int *size, int quality)
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
   gdImageJpegCtx (im, out, quality);
   rv = gdDPExtractData (out, size);
-  out->free (out);
+  out->gd_free (out);
   return rv;
 }
 
@@ -249,7 +248,6 @@ gdImageJpegCtx (gdImagePtr im, gdIOCtx * outfile, int quality)
 	}
     }
   jpeg_finish_compress (&cinfo);
-error:
   jpeg_destroy_compress (&cinfo);
   gdFree (row);
 }
@@ -260,7 +258,7 @@ gdImageCreateFromJpeg (FILE * inFile)
   gdImagePtr im;
   gdIOCtx *in = gdNewFileCtx (inFile);
   im = gdImageCreateFromJpegCtx (in);
-  in->free (in);
+  in->gd_free (in);
   return im;
 }
 
@@ -849,4 +847,4 @@ jpeg_gdIOCtx_dest (j_compress_ptr cinfo, gdIOCtx * outfile)
   dest->outfile = outfile;
 }
 
-#endif /* HAVE_JPEG */
+#endif /* HAVE_LIBJPEG */
diff --git a/src/gd_png.c b/src/gd_png.c
index 4b281a0..585e7da 100644
--- a/src/gd_png.c
+++ b/src/gd_png.c
@@ -1,11 +1,12 @@
-
-#ifdef HAVE_LIBPNG
-
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
 #include "gd.h"
+
+/* JCE: Arrange HAVE_LIBPNG so that it can be set in gd.h */
+#ifdef HAVE_LIBPNG
+
 #include "gdhelpers.h"
 #include "png.h"		/* includes zlib.h and setjmp.h */
 
@@ -101,7 +102,7 @@ gdImageCreateFromPng (FILE * inFile)
   gdImagePtr im;
   gdIOCtx *in = gdNewFileCtx (inFile);
   im = gdImageCreateFromPngCtx (in);
-  in->free (in);
+  in->gd_free (in);
   return im;
 }
 
@@ -125,7 +126,7 @@ gdImageCreateFromPngCtx (gdIOCtx * infile)
   png_bytep image_data = NULL;
   png_bytepp row_pointers = NULL;
   gdImagePtr im = NULL;
-  int i, j, *open;
+  int i, j, *open = NULL;
   volatile int transparent = -1;
   volatile int palette_allocated = FALSE;
 
@@ -421,7 +422,7 @@ gdImagePng (gdImagePtr im, FILE * outFile)
 {
   gdIOCtx *out = gdNewFileCtx (outFile);
   gdImagePngCtx (im, out);
-  out->free (out);
+  out->gd_free (out);
 }
 
 void *
@@ -431,7 +432,7 @@ gdImagePngPtr (gdImagePtr im, int *size)
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
   gdImagePngCtx (im, out);
   rv = gdDPExtractData (out, size);
-  out->free (out);
+  out->gd_free (out);
   return rv;
 }
 
@@ -442,7 +443,7 @@ gdImagePngPtr (gdImagePtr im, int *size)
 void
 gdImagePngCtx (gdImagePtr im, gdIOCtx * outfile)
 {
-  int i, j, bit_depth, interlace_type;
+  int i, j, bit_depth = 0, interlace_type;
   int width = im->sx;
   int height = im->sy;
   int colors = im->colorsTotal;
@@ -579,7 +580,6 @@ gdImagePngCtx (gdImagePtr im, gdIOCtx * outfile)
       int i;
       int j;
       int k;
-      int highTrans = -1;
       for (i = 0; (i < im->colorsTotal); i++)
 	{
 	  if ((!im->open[i]) &&
diff --git a/src/gd_ss.c b/src/gd_ss.c
index 200442b..85dd257 100644
--- a/src/gd_ss.c
+++ b/src/gd_ss.c
@@ -16,12 +16,13 @@ extern gdImagePtr gdImageCreateFromPngSource (gdSourcePtr inSource);
 /*#define GD_SS_DBG(s) (s) */
 #define GD_SS_DBG(s)
 
+#ifdef HAVE_LIBPNG
 void
 gdImagePngToSink (gdImagePtr im, gdSinkPtr outSink)
 {
   gdIOCtx *out = gdNewSSCtx (NULL, outSink);
   gdImagePngCtx (im, out);
-  out->free (out);
+  out->gd_free (out);
 }
 
 gdImagePtr
@@ -32,7 +33,20 @@ gdImageCreateFromPngSource (gdSourcePtr inSource)
 
   im = gdImageCreateFromPngCtx (in);
 
-  in->free (in);
+  in->gd_free (in);
 
   return im;
 }
+#else /* no HAVE_LIBPNG */
+void
+gdImagePngToSink (gdImagePtr im, gdSinkPtr outSink)
+{
+  fprintf(stderr,"PNG support is not available\n");
+}
+gdImagePtr
+gdImageCreateFromPngSource (gdSourcePtr inSource)
+{
+  fprintf(stderr,"PNG support is not available\n");
+  return NULL;
+}
+#endif /* HAVE_LIBPNG */
diff --git a/src/gd_topal.c b/src/gd_topal.c
index d2be750..9a2dad5 100644
--- a/src/gd_topal.c
+++ b/src/gd_topal.c
@@ -1,5 +1,3 @@
-
-
 /*
  * gd_topal.c 
  * 
@@ -26,6 +24,7 @@
  * may not have done a great job of either. It's not Thomas G. Lane's fault.
  */
 
+#include <string.h>
 #include "gd.h"
 #include "gdhelpers.h"
 
@@ -981,9 +980,9 @@ find_best_colors (gdImagePtr im, my_cquantize_ptr cquantize,
   register int *bptr;		/* pointer into bestdist[] array */
   int *cptr;			/* pointer into bestcolor[] array */
   int dist0, dist1, dist2;	/* initial distance values */
-  register int dist3;		/* current distance in inner loop */
+  register int dist3 = 0;	/* current distance in inner loop */
   int xx0, xx1, xx2;		/* distance increments */
-  register int xx3;
+  register int xx3 = 0;
   int inc0, inc1, inc2, inc3;	/* initial values for increments */
   /* This array holds the distance to the nearest-so-far color for each cell */
   int bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS * BOX_C3_ELEMS];
@@ -1574,7 +1573,11 @@ gdImageTrueColorToPalette (gdImagePtr im, int dither, int colorsWanted)
 				gdTrueColorAlpha (im->red[i], im->green[i],
 						im->blue[i], im->alpha[i]));
       }
+#ifdef HAVE_LIBPNG
     gdImagePng (im2, out);
+#else
+    fprintf(stderr, "No PNG library support.\n");
+#endif
     fclose (out);
     gdImageDestroy (im2);
   }
diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c
index 04a7108..e0abd94 100644
--- a/src/gd_wbmp.c
+++ b/src/gd_wbmp.c
@@ -188,7 +188,7 @@ gdImageCreateFromWBMP (FILE * inFile)
   gdImagePtr im;
   gdIOCtx *in = gdNewFileCtx (inFile);
   im = gdImageCreateFromWBMPCtx (in);
-  in->free (in);
+  in->gd_free (in);
   return (im);
 }
 
@@ -200,7 +200,7 @@ gdImageWBMP (gdImagePtr im, int fg, FILE * outFile)
 {
   gdIOCtx *out = gdNewFileCtx (outFile);
   gdImageWBMPCtx (im, fg, out);
-  out->free (out);
+  out->gd_free (out);
 }
 
 /* gdImageWBMPPtr
@@ -213,6 +213,6 @@ gdImageWBMPPtr (gdImagePtr im, int *size, int fg)
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
   gdImageWBMPCtx (im, fg, out);
   rv = gdDPExtractData (out, size);
-  out->free (out);
+  out->gd_free (out);
   return rv;
 }
diff --git a/src/gdcache.h b/src/gdcache.h
index f2e8509..172fe6b 100644
--- a/src/gdcache.h
+++ b/src/gdcache.h
@@ -40,7 +40,10 @@
 /* header                                                */
 /*********************************************************/
 
+#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 #ifndef NULL
 #define NULL (void *)0
 #endif
diff --git a/src/gddemo.c b/src/gddemo.c
index 9b8a4bf..73a6e1f 100644
--- a/src/gddemo.c
+++ b/src/gddemo.c
@@ -6,6 +6,7 @@
 int
 main (void)
 {
+#ifdef HAVE_LIBPNG
   /* Input and output files */
   FILE *in;
   FILE *out;
@@ -118,5 +119,8 @@ main (void)
     {
       gdImageDestroy (im_in);
     }
+#else
+  fprintf(stderr,"No PNG library support.\n");
+#endif /* HAVE_LIBPNG */
   return 0;
 }
diff --git a/src/gdft.c b/src/gdft.c
index 1862331..a72a8f7 100644
--- a/src/gdft.c
+++ b/src/gdft.c
@@ -15,7 +15,7 @@
 #ifndef MSWIN32
 #include <unistd.h>
 #else
-#define R_OK 2
+#include <io.h>
 #endif
 
 /* number of antialised colors for indexed bitmaps */
@@ -331,7 +331,7 @@ fontFetch (char **error, void *key)
   int n;
   int font_found = 0;
   unsigned short platform, encoding;
-  char *fontsearchpath, *fontpath, *fontlist;
+  char *fontsearchpath, *fontlist;
   char *fullname = NULL;
   char *name, *path, *dir;
   char *strtok_ptr;
@@ -349,7 +349,6 @@ fontFetch (char **error, void *key)
   fontsearchpath = getenv ("GDFONTPATH");
   if (!fontsearchpath)
     fontsearchpath = DEFAULT_FONTPATH;
-  path = strdup (fontsearchpath);
   fontlist = strdup (a->fontlist);
 
   /*
@@ -359,6 +358,8 @@ fontFetch (char **error, void *key)
        name = gd_strtok_r (0, LISTSEPARATOR, &strtok_ptr))
     {
 
+      /* make a fresh copy each time - strtok corrupts it. */
+      path = strdup (fontsearchpath);
       /*
        * Allocate an oversized buffer that is guaranteed to be
        * big enough for all paths to be tested.
@@ -366,7 +367,7 @@ fontFetch (char **error, void *key)
       fullname = gdRealloc (fullname,
 			    strlen (fontsearchpath) + strlen (name) + 6);
       /* if name is an absolute filename then test directly */
-      if (*name == '/')
+      if (*name == '/' || (name[0] != 0 && name[1] == ':' && (name[2] == '/' || name[2] == '\\')))
 	{
 	  sprintf (fullname, "%s", name);
 	  if (access (fullname, R_OK) == 0)
@@ -384,11 +385,23 @@ fontFetch (char **error, void *key)
 	      font_found++;
 	      break;
 	    }
+          sprintf (fullname, "%s/%s.pfa", dir, name);
+          if (access (fullname, R_OK) == 0)
+            {
+	      font_found++;
+	      break;
 	}
-      if (font_found)
+	  sprintf (fullname, "%s/%s.pfb", dir, name);
+	  if (access (fullname, R_OK) == 0)
+	    {
+	      font_found++;
 	break;
     }
+	}
   gdFree (path);
+      if (font_found)
+	break;
+  }
   gdFree (fontlist);
   if (!font_found)
     {
@@ -500,16 +513,35 @@ tweenColorFetch (char **error, void *key)
   /* if fg is specified by a negative color idx, then don't antialias */
   if (fg < 0)
     {
+      if ((pixel + pixel) >= NUMCOLORS)
       a->tweencolor = -fg;
+      else
+	  a->tweencolor = bg;
     }
   else
     {
       npixel = NUMCOLORS - pixel;
+      if (im->trueColor)
+       {
+         /* 2.0.1: use gdImageSetPixel to do the alpha blending work,
+            or to just store the alpha level. All we have to do here
+            is incorporate our knowledge of the percentage of this
+            pixel that is really "lit" by pushing the alpha value
+            up toward transparency in edge regions. */
+         a->tweencolor = gdTrueColorAlpha (
+                                            gdTrueColorGetRed (fg),
+                                            gdTrueColorGetGreen (fg),
+                                            gdTrueColorGetBlue (fg),
+              gdAlphaMax - (gdTrueColorGetAlpha (fg) * pixel / NUMCOLORS));
+       }
+      else
+       {
 	  a->tweencolor = gdImageColorResolve (im,
 		   (pixel * im->red[fg] + npixel * im->red[bg]) / NUMCOLORS,
 	       (pixel * im->green[fg] + npixel * im->green[bg]) / NUMCOLORS,
 		(pixel * im->blue[fg] + npixel * im->blue[bg]) / NUMCOLORS);
     }
+    }
   return (void *) a;
 }
 
@@ -521,24 +553,15 @@ tweenColorRelease (void *element)
 
 /* draw_bitmap - transfers glyph bitmap to GD image */
 static char *
-gdft_draw_bitmap (gdImage * im, int fg, FT_Bitmap bitmap, int pen_x, int pen_y)
+gdft_draw_bitmap (gdCache_head_t *tc_cache, gdImage * im, int fg, FT_Bitmap bitmap, int pen_x, int pen_y)
 {
-  unsigned char *pixel;
-  int *tpixel;
+  unsigned char *pixel = NULL;
+  int *tpixel = NULL;
   int x, y, row, col, pc;
 
   tweencolor_t *tc_elem;
   tweencolorkey_t tc_key;
 
-  /* initialize tweenColorCache on first call */
-  static gdCache_head_t *tc_cache;
-
-  if (!tc_cache)
-    {
-      tc_cache = gdCacheCreate (TWEENCOLORCACHESIZE,
-			tweenColorTest, tweenColorFetch, tweenColorRelease);
-    }
-
   /* copy to image, mapping colors */
   tc_key.fgcolor = fg;
   tc_key.im = im;
@@ -564,7 +587,7 @@ gdft_draw_bitmap (gdImage * im, int fg, FT_Bitmap bitmap, int pen_x, int pen_y)
 	      level = (bitmap.buffer[pc] * gdAlphaMax /
                 (bitmap.num_grays - 1)); 
             }
-          else if (bitmap.pixel_mode = ft_pixel_mode_mono)
+          else if (bitmap.pixel_mode == ft_pixel_mode_mono)
             {
               level = ((bitmap.buffer[pc / 8]
 			       << (pc % 8)) & 128) ? gdAlphaOpaque :
@@ -605,6 +628,9 @@ gdft_draw_bitmap (gdImage * im, int fg, FT_Bitmap bitmap, int pen_x, int pen_y)
   for (row = 0; row < bitmap.rows; row++)
     {
       pc = row * bitmap.pitch;
+      if(bitmap.pixel_mode==ft_pixel_mode_mono)
+             pc *= 8;    /* pc is measured in bits for monochrome images */
+
       y = pen_y + row;
 
       /* clip if out of bounds */
@@ -663,8 +689,31 @@ gdft_draw_bitmap (gdImage * im, int fg, FT_Bitmap bitmap, int pen_x, int pen_y)
   return (char *) NULL;
 }
 
+static int
+gdroundupdown (FT_F26Dot6 v1, int updown)
+{
+  return (!updown)
+    ? (v1 < 0 ? ((v1 - 63) >> 6) : v1 >> 6)
+    : (v1 > 0 ? ((v1 + 63) >> 6) : v1 >> 6);
+}
+
 extern int any2eucjp (char *, char *, unsigned int);
 
+/* Persistent font cache until explicitly cleared */
+/*     Fonts can be used across multiple images */
+static gdCache_head_t *fontCache;
+static FT_Library library;
+
+void
+gdFreeFontCache()
+{
+  if (fontCache)
+    {
+      gdCacheDelete(fontCache);
+      FT_Done_FreeType(library);
+    }
+}
+
 /********************************************************************/
 /* gdImageStringFT -  render a utf8 string onto a gd image          */
 
@@ -691,15 +740,27 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
   char *tmpstr = 0;
   int render = (im && (im->trueColor || (fg <= 255 && fg >= -255)));
   FT_BitmapGlyph bm;
+  int render_mode = FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT;
+
+  /*
+   *   make a new tweenColorCache on every call
+   *   because caching colormappings between calls
+   *   is not safe. If the im-pointer points to a
+   *   brand new image, the cache gives out bogus
+   *   colorindexes.          -- 27.06.2001 <krisku@arrak.fi>
+   */
+  gdCache_head_t  *tc_cache;
+
+  tc_cache = gdCacheCreate( TWEENCOLORCACHESIZE,
+               tweenColorTest, tweenColorFetch, tweenColorRelease );
 
 /***** initialize font library and font cache on first call ******/
-  static gdCache_head_t *fontCache;
-  static FT_Library library;
 
   if (!fontCache)
     {
       if (FT_Init_FreeType (&library))
 	{
+	  gdCacheDelete( tc_cache );
 	  return "Failure to initialize font library";
 	}
       fontCache = gdCacheCreate (FONTCACHESIZE,
@@ -713,6 +774,7 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
   font = (font_t *) gdCacheGet (fontCache, &fontkey);
   if (!font)
     {
+      gdCacheDelete( tc_cache );
       return fontCache->error;
     }
   face = font->face;		/* shortcut */
@@ -721,6 +783,7 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
   if (FT_Set_Char_Size (face, 0, (FT_F26Dot6) (ptsize * 64),
 			GD_RESOLUTION, GD_RESOLUTION))
     {
+      gdCacheDelete( tc_cache );
       return "Could not set character size";
     }
 
@@ -735,12 +798,16 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
 
   use_kerning = FT_HAS_KERNING (face);
   previous = 0;
+  if (fg < 0)
+    {
+      render_mode |= FT_LOAD_MONOCHROME;
+    }
 
 #ifndef JISX0208
   if (font->have_char_map_sjis)
     {
 #endif
-      if (tmpstr = (char *) gdMalloc (BUFSIZ))
+      if ((tmpstr = (char *) gdMalloc (BUFSIZ)))
 	{
 	  any2eucjp (tmpstr, string, BUFSIZ);
 	  next = tmpstr;
@@ -841,6 +908,9 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
 	    }
 	}
 
+      /* set rotation transform */
+      FT_Set_Transform(face, &matrix, NULL);
+
       /* Convert character code to glyph index */
       glyph_index = FT_Get_Char_Index (face, ch);
 
@@ -853,24 +923,33 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
 	}
 
       /* load glyph image into the slot (erase previous one) */
-      err = FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT);
+      err = FT_Load_Glyph (face, glyph_index, render_mode);
       if (err)
+	{
+	  gdCacheDelete( tc_cache );
 	return "Problem loading glyph";
+	}
 
       /* transform glyph image */
       FT_Get_Glyph (slot, &image);
       if (brect)
 	{			/* only if need brect */
 	  FT_Glyph_Get_CBox (image, ft_glyph_bbox_gridfit, &glyph_bbox);
-	  if (!i)
-	    {			/* if first character, init BB corner values */
-	      bbox.xMin = bbox.yMin = (1 << 30) - 1;
-	      bbox.xMax = bbox.yMax = -bbox.xMin;
-	    }
 	  glyph_bbox.xMin += penf.x;
 	  glyph_bbox.yMin += penf.y;
 	  glyph_bbox.xMax += penf.x;
 	  glyph_bbox.yMax += penf.y;
+	  if (ch == ' ')   /* special case for trailing space */
+             glyph_bbox.xMax += slot->metrics.horiAdvance;
+          if (!i)
+	     {                   /* if first character, init BB corner values */
+	        bbox.xMin = glyph_bbox.xMin;
+		bbox.yMin = glyph_bbox.yMin;
+		bbox.xMax = glyph_bbox.xMax;
+		bbox.yMax = glyph_bbox.yMax;
+	     }
+	   else
+	     {
 	  if (bbox.xMin > glyph_bbox.xMin)
 	    bbox.xMin = glyph_bbox.xMin;
 	  if (bbox.yMin > glyph_bbox.yMin)
@@ -879,24 +958,25 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
 	    bbox.xMax = glyph_bbox.xMax;
 	  if (bbox.yMax < glyph_bbox.yMax)
 	    bbox.yMax = glyph_bbox.yMax;
+	     }
 	  i++;
 	}
 
-      /* transform glyph image */
-      FT_Glyph_Transform (image, &matrix, 0);
-
       if (render)
 	{
 	  if (image->format != ft_glyph_format_bitmap)
 	    {
 	      err = FT_Glyph_To_Bitmap (&image, ft_render_mode_normal, 0, 1);
 	      if (err)
+		{
+		  gdCacheDelete( tc_cache );
 		return "Problem rendering glyph";
 	    }
+	    }
 
 	  /* now, draw to our target surface */
 	  bm = (FT_BitmapGlyph) image;
-	  gdft_draw_bitmap (im, fg, bm->bitmap,
+	  gdft_draw_bitmap (tc_cache, im, fg, bm->bitmap,
 			    x + x1 + ((pen.x + 31) >> 6) + bm->left,
 			    y - y1 + ((pen.y + 31) >> 6) - bm->top);
 	}
@@ -942,15 +1022,8 @@ gdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
 
   if (tmpstr)
     gdFree (tmpstr);
+  gdCacheDelete( tc_cache );
   return (char *) NULL;
 }
 
-int
-gdroundupdown (FT_F26Dot6 v1, int updown)
-{
-  return (!updown)
-    ? (v1 < 0 ? ((v1 - 63) >> 6) : v1 >> 6)
-    : (v1 > 0 ? ((v1 + 63) >> 6) : v1 >> 6);
-}
-
 #endif /* HAVE_LIBFREETYPE */
diff --git a/src/gdhelpers.c b/src/gdhelpers.c
index 7909ca0..9153d73 100644
--- a/src/gdhelpers.c
+++ b/src/gdhelpers.c
@@ -1,6 +1,10 @@
 #include "gd.h"
 #include "gdhelpers.h"
 #include <stdlib.h>
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+#include <string.h>
 
 /* TBB: gd_strtok_r is not portable; provide an implementation */
 
diff --git a/src/gdhelpers.h b/src/gdhelpers.h
index aefcc18..220c015 100644
--- a/src/gdhelpers.h
+++ b/src/gdhelpers.h
@@ -1,6 +1,9 @@
 #ifndef GDHELPERS_H 
 #define GDHELPERS_H 1
 
+/* sys/types.h is needed for size_t on Sparc-SunOS-4.1 */
+#include <sys/types.h>
+
 /* TBB: strtok_r is not universal; provide an implementation of it. */
 
 extern char *gd_strtok_r(char *s, char *sep, char **state);
diff --git a/src/gdkanji.c b/src/gdkanji.c
index 98ed4b7..21eb2d3 100644
--- a/src/gdkanji.c
+++ b/src/gdkanji.c
@@ -360,7 +360,7 @@ do_convert (unsigned char *to, unsigned char *from, const char *code)
   from_len = strlen ((const char *) from) + 1;
   to_len = BUFSIZ;
 
-  if (iconv (cd, (const char **) &from, &from_len,
+  if (iconv (cd, (char **) &from, &from_len,
 	     (char **) &to, &to_len) == -1)
     {
 #ifdef HAVE_ERRNO_H
diff --git a/src/gdparttopng.c b/src/gdparttopng.c
index 03386b8..677a0b5 100644
--- a/src/gdparttopng.c
+++ b/src/gdparttopng.c
@@ -47,7 +47,11 @@ main (int argc, char **argv)
       gdImageDestroy (im);
       exit (1);
     }
+#ifdef HAVE_LIBPNG
   gdImagePng (im, out);
+#else
+  fprintf(stderr, "No PNG library support.\n");
+#endif
   fclose (out);
   gdImageDestroy (im);
 
diff --git a/src/gdtest.c b/src/gdtest.c
index 68d1d23..fe1cd6e 100644
--- a/src/gdtest.c
+++ b/src/gdtest.c
@@ -19,6 +19,7 @@ static int fwriteWrapper (void *context, const char *buffer, int len);
 int
 main (int argc, char **argv)
 {
+#ifdef HAVE_LIBPNG
   gdImagePtr im, ref, im2, im3;
   FILE *in, *out;
   void *iptr;
@@ -82,7 +83,7 @@ main (int argc, char **argv)
   CompareImages ("GD->PNG ptr->GD", ref, im2);
 
   gdImageDestroy (im2);
-  ctx->free (ctx);
+  ctx->gd_free (ctx);
 
 
   /* */
@@ -117,7 +118,7 @@ main (int argc, char **argv)
   CompareImages ("GD->GD2 ptr->GD", ref, im2);
 
   gdImageDestroy (im2);
-  ctx->free (ctx);
+  ctx->gd_free (ctx);
 
 
   /* */
@@ -152,7 +153,7 @@ main (int argc, char **argv)
   CompareImages ("GD->GD ptr->GD", ref, im2);
 
   gdImageDestroy (im2);
-  ctx->free (ctx);
+  ctx->gd_free (ctx);
 
   /*
      ** Test gdImageCreateFromPngSource'
@@ -270,7 +271,7 @@ main (int argc, char **argv)
   gdImageDestroy (im2);
   gdImageDestroy (im3);
 
-#ifdef HAVE_JPEG
+#ifdef HAVE_LIBJPEG
   out = fopen ("test/gdtest.jpg", "wb");
   if (!out)
     {
@@ -296,7 +297,7 @@ main (int argc, char **argv)
   printf ("Created test/gdtest.jpg successfully. Compare this image\n"
 	  "to the input image manually. Some difference must be\n"
 	  "expected as JPEG is a lossy file format.\n");
-#endif /* HAVE_JPEG */
+#endif /* HAVE_LIBJPEG */
   /* Assume the color closest to black is the foreground
      color for the B&W wbmp image. */
   fprintf (stderr, "NOTE: the WBMP output image will NOT match the original unless the original\n"
@@ -352,6 +353,9 @@ main (int argc, char **argv)
     }
   gdImageDestroy (im);
   gdImageDestroy (ref);
+#else
+  fprintf(stderr, "No PNG library support.\n");
+#endif /* HAVE_LIBPNG */
 
   return 0;
 }
diff --git a/src/gdtestft.c b/src/gdtestft.c
index 4d4860d..b21401c 100644
--- a/src/gdtestft.c
+++ b/src/gdtestft.c
@@ -1,4 +1,3 @@
-
 #include "gd.h"
 #include <string.h>
 
@@ -139,7 +138,7 @@ main (int argc, char *argv[])
   out = fopen ("test/fttest.jpg", "wb");
   if (!out)
     {
-      fprintf (stderr, "Can't create test/fttest.png\n");
+      fprintf (stderr, "Can't create test/fttest.jpg\n");
       exit (1);
     }
   /* Fairly high JPEG quality setting */
@@ -150,5 +149,5 @@ main (int argc, char *argv[])
   gdImageDestroy (im);
 
   return 0;
-#endif /* HAVE_FREETYPE */
+#endif /* HAVE_LIBFREETYPE */
 }
diff --git a/src/gdtopng.c b/src/gdtopng.c
index 9de3499..2b262ba 100644
--- a/src/gdtopng.c
+++ b/src/gdtopng.c
@@ -36,7 +36,11 @@ main (int argc, char **argv)
       gdImageDestroy (im);
       exit (1);
     }
+#ifdef HAVE_LIBPNG
   gdImagePng (im, out);
+#else
+  fprintf(stderr, "No PNG library support.\n");
+#endif
   fclose (out);
   gdImageDestroy (im);
 
diff --git a/src/gdxpm.c b/src/gdxpm.c
index 839e6c8..75160a1 100644
--- a/src/gdxpm.c
+++ b/src/gdxpm.c
@@ -10,7 +10,7 @@
 #include "gd.h"
 #include "gdhelpers.h"
 
-#ifndef HAVE_XPM
+#ifndef HAVE_LIBXPM
 gdImagePtr
 gdImageCreateFromXpm (char *filename)
 {
@@ -145,4 +145,4 @@ gdImageCreateFromXpm (char *filename)
   gdFree (colors);
   return (im);
 }
-#endif
+#endif /* HAVE_LIBXPM */
diff --git a/src/index.html b/src/index.html
index 65de08a..afccb9e 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,19 +1,19 @@
 <HTML>
 <HEAD>
-<TITLE>gd 2.0.3</TITLE>
+<TITLE>gd 2.0.4</TITLE>
 </HEAD>
 <BODY>
 <!-- BANNER HERE -->
-<h1>This is gd 2.0.3.</h1>
+<h1>This is gd 2.0.4.</h1>
 <p>
-<H2>gd 2.0.3</H2>
+<H2>gd 2.0.4</H2>
 <H3>A graphics library for fast image creation</H3>
 <H3>Follow this link to the
 <A HREF="http://www.boutell.com/gd/">latest version
 of this document</A>.</H3>
 <blockquote>
 <strong>HEY! READ THIS!</strong>
-gd 2.0.3 creates PNG, JPEG and WBMP images, not GIF images. This is a 
+gd 2.0.4 creates PNG, JPEG and WBMP images, not GIF images. This is a 
 good thing.  PNG is a more compact format, and full compression is
 available.  JPEG works best with photographic images, and is still
 more compatible with the major Web browsers than even PNG is. WBMP is
@@ -26,7 +26,7 @@ solution is to move to legally unencumbered, well-compressed,
 modern image formats such as PNG and JPEG as soon as possible.
 
 <p>
-gd 2.0.3 <strong>requires</strong> that the following libraries 
+gd 2.0.4 <strong>requires</strong> that the following libraries 
 also be installed, in order to produce the related image formats:
 <p>
 libpng (see the <a href="http://www.libpng.org/pub/png/">libpng home page</a>), if you want PNG
@@ -56,7 +56,7 @@ information. Thank you!
 <H3>Table of Contents</H3>
 <UL>
 <LI><A HREF="#notice">Credits and license terms</A>
-<LI><A HREF="#whatsnew2.0.3">What's new in version "XYZ" of GD?</A>
+<LI><A HREF="#whatsnew2.0.4">What's new in version "XYZ" of GD?</A>
 <LI><A HREF="#whatis">What is gd?</A>
 <LI><A HREF="#gdother">What if I want to use another programming language?</A>
 <LI><A HREF="#required">What else do I need to use gd?</A>
@@ -96,7 +96,9 @@ Portions relating to GD2 format copyright 1999, 2000, 2001, 2002 Philip Warner.
 <p>
 Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg Roelofs.
 <p>
-Portions relating to libttf copyright 1999, 2000, 2001, 2002 John Ellson (ellson@lucent.com).
+Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002 John Ellson (ellson@lucent.com).
+<p>
+Portions relating to gdft.c copyright 2001, 2002 John Ellson (ellson@lucent.com).
 <p>
 Portions relating to JPEG and to color quantization copyright 2000, 2001, 2002, Doug Becker and copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, Thomas G. Lane.  This software is based 
 in part on the work of the Independent JPEG Group. See the file
@@ -121,7 +123,7 @@ including but not limited to implied warranties of merchantability and
 fitness for a particular purpose, with respect to this code and accompanying
 documentation.
 <p>
-Although their code does not appear in gd 2.0.3, the authors wish to 
+Although their code does not appear in gd 2.0.4, the authors wish to 
 thank David Koblas, David Rowley, and Hutchison Avenue Software 
 Corporation for their prior contributions.
 </blockquote>
@@ -153,13 +155,17 @@ and so forth.
 <A NAME="gdother"><H3>What if I want to use another programming
 language?</h3></A>
 Not all of these tools are necessarily up to date and fully compatible
-with 2.0.3.
+with 2.0.4.
 <h4>Perl</h4>
 gd can also be used from Perl, courtesy of
 Lincoln Stein's
 <a href="http://stein.cshl.org/WWW/software/GD/">
 GD.pm</a> library, which uses gd as the basis for a set of
 Perl 5.x classes. Highly recommended.
+<h4>Tcl</h4>
+gd can be used from Tcl with John Ellson's
+<a href=http://www.graphviz.org/pub/>Gdtclft</a>
+dynamically loaded extension package.
 <h4>Pascal</h4>
 Pascal enthusiasts should look into Michael Bradbury's
 <a href="http://www.elj.com/dev/free-pascal/gdfp/">gdfp</a> package.
@@ -177,6 +183,33 @@ invoke the interpreter.
 <li><a href="http://martin.gleeson.com/fly/">fly</a>, by Martin Gleeson
 </ul>
 <P>
+<A NAME="whatsnew2.0.4"><H3>What's new in version 2.0.4?</H3></A>
+The following contributions from John Ellson:
+<ul>
+<li>Various test programs now compile in the absence
+of PNG support
+<li>gdIOCtx correctly calls gdFree rather than free
+<li>Various cleanups to pass -Wall without warnings
+<li>Support for Adobe-style Type 1 fonts (.pfa and .pfb files)
+via freetype
+<li>gdImageColorResolve and gdImageColorResolveAlpha will not
+attempt to resolve a color request to the transparent color index
+(for palette-based images)
+<li>Improved font search path support
+<li>Antialiased freetype text on palette images works properly
+when more than one image is created in a single program lifetime
+with different color indexes
+<li>Better threshold for two-color "mono" images 
+<li>Memory leak fixes
+<li>Text rotation fix
+<li>More extensive default font path
+<li>fontwheeltest and fontsizetest test programs for freetype
+</ul>
+And the following additional fixes:
+<ul>
+<li><code>configure</code> now correctly detects and provides
+support for the Xpm library and its dependencies (Len Makin)
+</ul>
 <A NAME="whatsnew2.0.3"><H3>What's new in version 2.0.3?</H3></A>
 <ul>
 <li>The <code>configure</code> script has been extensively modified
@@ -632,15 +665,9 @@ blending in the library by default; it is possible to turn on the
 saving of alpha channel information to the file instead.
 <P>
 <A NAME="getgd"><H3>How do I get gd?</H3></A>
-<h4>By HTTP</h4>
-<ul>
-<li><a href="http://www.boutell.com/gd/http/gd-2.0.3.tar.gz">Gzipped Tar File (Unix)</a>
-<li><a href="http://www.boutell.com/gd/http/gd-2.0.3.zip">.ZIP File (Windows)</a>
-</ul>
-<h4>By FTP</h4>
 <ul>
-<li><a href="ftp://ftp.boutell.com/pub/boutell/gd/gd-2.0.3.tar.gz">Gzipped Tar File (Unix)</a>
-<li><a href="ftp://ftp.boutell.com/pub/boutell/gd/gd-2.0.3.zip">.ZIP File (Windows)</a>
+<li><a href="http://www.boutell.com/gd/http/gd-2.0.4.tar.gz">Gzipped Tar File (Unix)</a>
+<li><a href="http://www.boutell.com/gd/http/gd-2.0.4.zip">.ZIP File (Windows)</a>
 </ul>
 <P>
 <A NAME="buildgd"><H3>How do I build gd?</H3></A>
@@ -651,10 +678,10 @@ downloaded. If you are not familiar with <code>tar</code> and
 consult with an experienced user of your system. Sorry, we cannot
 answer questions about basic Internet skills.
 <p>
-Unpacking the archive will produce a directory called "gd-2.0.3".
+Unpacking the archive will produce a directory called "gd-2.0.4".
 <p>
 <h4>For Unix</h4>
-<code>cd</code> to the 2.0.3 directory and type:
+<code>cd</code> to the 2.0.4 directory and type:
 <p>
 <code>./configure</code>
 <p>
diff --git a/src/makefile.sample b/src/makefile.sample
index 713b01d..5fb59ac 100755
--- a/src/makefile.sample
+++ b/src/makefile.sample
@@ -8,7 +8,7 @@ LINK_SHARED_TAIL=
 #for your system. 
 AR=ar
 
-CFLAGS=-g  -DHAVE_LIBPNG -DHAVE_LIBZ -DHAVE_LIBJPEG -DHAVE_LIBFREETYPE
+CFLAGS=-g -DHAVE_LIBPNG -DHAVE_LIBZ -DHAVE_LIBJPEG -DHAVE_MALLOC_H -DHAVE_LIBFREETYPE -DHAVE_LIBXPM
 
 LIBS=-lgd  -lpng -lz -ljpeg -lfreetype -lm
 
@@ -31,7 +31,7 @@ INSTALL_BIN=/usr/bin
 # Update these with each release!
 
 MAJOR_VERSION=2
-VERSION=2.0.2
+VERSION=2.0.3
 
 COMPILER=gcc -fPIC
 
@@ -41,7 +41,7 @@ LINK=$(CC) $(LIBDIRS) $(LIBS)
 PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
 
 BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
-TEST_PROGRAMS=gdtest gddemo gd2time gdtestft testac
+TEST_PROGRAMS=gdtest gddemo gd2time gdtestft testac fontsizetest fontwheeltest
 
 default: instructions
 
@@ -120,6 +120,12 @@ gd2time: gd2time.o
 gdtestft: gdtestft.o
 	$(CC) --verbose gdtestft.o -o gdtestft $(LIBDIRS) $(LIBS)
 
+fontwheeltest: fontwheeltest.o
+	$(CC) --verbose fontwheeltest.o -o fontwheeltest $(LIBDIRS) $(LIBS)
+
+fontsizetest: fontsizetest.o
+	$(CC) --verbose fontsizetest.o -o fontsizetest $(LIBDIRS) $(LIBS)
+
 LIBOBJS=gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \
 		gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o \
 		gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
@@ -150,4 +156,4 @@ libgd.a: ${LIBOBJS}
 	-ranlib libgd.a
 
 clean:
-	rm -f *.o *.a *.so ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp test/fttest.png test/fttest.jpg
+	rm -f *.o *.a *.so ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp test/fttest.png test/fttest.jpg font*test*.png
diff --git a/src/testac.c b/src/testac.c
index 55a5434..d5e3b81 100644
--- a/src/testac.c
+++ b/src/testac.c
@@ -16,6 +16,7 @@ void testDrawing (
 int
 main (int argc, char *argv[])
 {
+#ifdef HAVE_LIBPNG
   /* Input and output files */
   FILE *in;
   FILE *out;
@@ -61,6 +62,10 @@ main (int argc, char *argv[])
   testDrawing (im_in, 2.0, 0, 1, "noblending-doublesize-palette.png");
   testDrawing (im_in, 2.0, 1, 1, "blending-doublesize-palette.png");
   gdImageDestroy (im_in);
+#else
+  fprintf(stderr, "No PNG library support.\n");
+#endif
+
   return 0;
 }
 
@@ -122,7 +127,11 @@ testDrawing (
       gdImageTrueColorToPalette (im_out, 1, 256);
     }
 
+#ifdef HAVE_LIBPNG
   gdImagePng (im_out, out);
+#else
+  fprintf(stderr, "No PNG library support.\n");
+#endif
   fclose (out);
 
   gdImageDestroy (im_out);
diff --git a/src/wbmp.c b/src/wbmp.c
index 828beeb..039d80f 100644
--- a/src/wbmp.c
+++ b/src/wbmp.c
@@ -44,7 +44,7 @@ getmbi (int (*getin) (void *in), void *in)
       i = getin (in);
       if (i < 0)
 	return (-1);
-      mbi = mbi << 7 | i & 0x7f;
+      mbi = (mbi << 7) | (i & 0x7f);
     }
   while (i & 0x80);
 
diff --git a/src/webpng.c b/src/webpng.c
index 8065acc..3994c5e 100644
--- a/src/webpng.c
+++ b/src/webpng.c
@@ -58,7 +58,11 @@ main (int argc, char **argv)
       exit (1);
     }
   /* Now load the image. */
+#ifdef HAVE_LIBPNG
   im = gdImageCreateFromPng (in);
+#else
+  fprintf(stderr, "No PNG library support.\n");
+#endif
   fclose (in);
   /* If the load failed, it must not be a PNG file. */
   if (!im)
@@ -229,8 +233,11 @@ usage:
 	}
 
       /* Write the new PNG. */
+#ifdef HAVE_LIBPNG
       gdImagePng (im, out);
-
+#else
+      fprintf(stderr, "No PNG library support.\n");
+#endif
       if (!useStdinStdout)
 	{
 	  fclose (out);