bitmaps were vertically shifted by one pixel

diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index 2796b683df7bff956ea837b20a01f521f24933b8..e69f71224f9713ef5be1ba22bf313151aa77a928 100644 (file)
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -1,4 +1,4 @@
-/* $Id: xfonts.c,v 1.4 1999/11/28 20:11:56 brianp Exp $ */
+/* $Id: xfonts.c,v 1.5 1999/12/12 17:04:50 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -337,7 +337,8 @@ void Fake_glXUseXFont( Font font, int first, int count, int listbase )
       width = ch->rbearing - ch->lbearing;
       height = ch->ascent + ch->descent;
       x0 = - ch->lbearing;
-      y0 = ch->descent - 1;
+      y0 = ch->descent - 0;  /* XXX used to subtract 1 here */
+                             /* but that caused a conformace failure */
       dx = ch->width;
       dy = 0;