diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:20 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:20 +0000 |
| commit | fb0cbe6e7287d635a5f368e055cc0aae6ed50125 (patch) | |
| tree | 24940f60afb7e084ca0760710bf9d1ffd21c384a /src/Speedo | |
| parent | ca219ad2fc4f392505d378dfa5a2b34d33de6d61 (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')
| -rw-r--r-- | src/Speedo/set_trns.c | 9 | ||||
| -rw-r--r-- | src/Speedo/spfont.c | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/Speedo/set_trns.c b/src/Speedo/set_trns.c index b7f0e31..18d87ec 100644 --- a/src/Speedo/set_trns.c +++ b/src/Speedo/set_trns.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/set_trns.c,v 1.5 2002/09/18 17:11:44 tsi Exp $ */ +/* $XFree86: xc/lib/font/Speedo/set_trns.c,v 1.6 2003/05/27 22:26:44 tsi Exp $ */ @@ -152,7 +152,6 @@ ufix8 format) /* Character format byte */ { fix15 i,n; ufix16 tmpufix16; -fix15 constr; n = sp_globals.no_X_orus + sp_globals.no_Y_orus - 2; for (i = 0; i < n; i++) /* For each entry in control table ... */ @@ -162,7 +161,7 @@ for (i = 0; i < n; i++) /* For each entry in control table ... */ else pointer += 2; /* Skip FROM and TO fields */ /* skip constraints field */ - constr = NEXT_BYTES (pointer, tmpufix16); + NEXT_BYTES (pointer, tmpufix16); } return pointer; @@ -936,8 +935,10 @@ fix15 no_Y_ctrl_zones) /* Number of Y control zones */ { fix15 i, j, n; fix31 ppo; +#if INCL_SQUEEZING || INCL_ISW fix31 xppo0; /* top level pixels per oru */ fix31 yppo0; /* top level pixels per oru */ +#endif ufix8 edge_org; ufix8 edge; ufix8 start_edge; @@ -975,9 +976,9 @@ constr_org = 0; sp_globals.rnd_xmin = 0; /* initialize the error for chars with no zone */ n = no_X_ctrl_zones; ppo = sp_globals.tcb.xppo; +#if INCL_SQUEEZING || INCL_ISW xppo0 = sp_globals.tcb0.xppo; yppo0 = sp_globals.tcb0.yppo; -#if INCL_SQUEEZING || INCL_ISW squeezed_x = FALSE; #endif 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 |