summaryrefslogtreecommitdiff
path: root/src/Speedo/spfont.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:20 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:20 +0000
commitfb0cbe6e7287d635a5f368e055cc0aae6ed50125 (patch)
tree24940f60afb7e084ca0760710bf9d1ffd21c384a /src/Speedo/spfont.c
parentca219ad2fc4f392505d378dfa5a2b34d33de6d61 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'src/Speedo/spfont.c')
-rw-r--r--src/Speedo/spfont.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Speedo/spfont.c b/src/Speedo/spfont.c
index 61ec6d4..7799eef 100644
--- a/src/Speedo/spfont.c
+++ b/src/Speedo/spfont.c
@@ -21,7 +21,7 @@
*
* Author: Dave Lemke, Network Computing Devices Inc
*/
-/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.12 2001/12/14 19:56:41 dawes Exp $ */
+/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.13 2003/05/27 22:26:44 tsi Exp $ */
/*
@@ -106,7 +106,9 @@ sp_get_glyphs(
unsigned int r;
CharInfoPtr encoding;
CharInfoPtr pDefault;
+#ifdef notyet
int itemSize;
+#endif
int err = Successful;
spf = (SpeedoFontPtr) pFont->fontPrivate;
@@ -119,12 +121,12 @@ sp_get_glyphs(
/* XXX - this should be much smarter */
/* make sure the glyphs are there */
+#ifdef notyet
if (charEncoding == Linear8Bit || charEncoding == TwoD8Bit)
itemSize = 1;
else
itemSize = 2;
-#ifdef notyet
if (!fsd->complete)
err = fs_load_glyphs(NULL, pFont, count, itemSize, chars);
#endif