diff options
| author | Fabien Costantini <fabien@onepost.net> | 2012-04-22 02:45:09 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2012-04-22 02:45:09 +0000 |
| commit | 822bc272fc05b79a4385cbf139f4a6c87031617a (patch) | |
| tree | 24fb3b283eb7b2b8f8c70ac66df38e759ebfd2dd /src/xutf8/utf8Wrap.c | |
| parent | 4f7f902a00678be6a3028f12037fa2e337baf881 (diff) | |
Fixed linux 64 gcc 4.6.1 compilation problems
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9373 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/xutf8/utf8Wrap.c')
| -rw-r--r-- | src/xutf8/utf8Wrap.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c index 1ca187cf5..662f218c8 100644 --- a/src/xutf8/utf8Wrap.c +++ b/src/xutf8/utf8Wrap.c @@ -230,10 +230,10 @@ load_fonts(Display *dpy, XUtf8FontStruct *font_set) { int i; - char **list; + //char **list; i = 0; - list = NULL; + //list = NULL; font_set->fonts = (XFontStruct**) malloc(sizeof(XFontStruct*) * font_set->nb_font); @@ -820,19 +820,19 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, XFontStruct **fnt, unsigned short *id) { - int x; + //int x; int *encodings; /* encodings array */ XFontStruct **fonts; /* fonts array */ int fnum; /* index of the current font in the fonts array*/ - int i; /* current byte in the XChar2b buffer */ + //int i; /* current byte in the XChar2b buffer */ int first; /* first valid font index */ - int last_fnum; /* font index of the previous char */ + //int last_fnum; /* font index of the previous char */ int nb_font; /* quantity of fonts in the font array */ char glyph[2]; /* byte1 and byte2 value of the UTF-8 char */ int *ranges; /* sub range of iso10646 */ nb_font = font_set->nb_font; - x = 0; + //x = 0; if (nb_font < 1) { /* there is no font in the font_set :-( */ @@ -842,7 +842,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, ranges = font_set->ranges; fonts = font_set->fonts; encodings = font_set->encodings; - i = 0; + //i = 0; fnum = 0; while(fnum < nb_font && !fonts[fnum]) fnum++; @@ -852,7 +852,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, } first = fnum; - last_fnum = fnum; + //last_fnum = fnum; /* * find the first encoding which can be used to @@ -894,9 +894,9 @@ XUtf8UcsWidth(XUtf8FontStruct *font_set, XFontStruct **fonts; /* fonts array */ Fl_XChar2b buf[8]; /* drawing buffer */ int fnum; /* index of the current font in the fonts array*/ - int i; /* current byte in the XChar2b buffer */ + //int i; /* current byte in the XChar2b buffer */ int first; /* first valid font index */ - int last_fnum; /* font index of the previous char */ + //int last_fnum; /* font index of the previous char */ int nb_font; /* quantity of fonts in the font array */ char glyph[2]; /* byte1 and byte2 value of the UTF-8 char */ int *ranges; /* sub range of iso10646 */ @@ -913,7 +913,7 @@ XUtf8UcsWidth(XUtf8FontStruct *font_set, ranges = font_set->ranges; fonts = font_set->fonts; encodings = font_set->encodings; - i = 0; + //i = 0; fnum = 0; while(fnum < nb_font && !fonts[fnum]) fnum++; @@ -923,7 +923,7 @@ XUtf8UcsWidth(XUtf8FontStruct *font_set, } first = fnum; - last_fnum = fnum; + //last_fnum = fnum; no_spc = XUtf8IsNonSpacing(ucs); if (no_spc) ucs = no_spc; |