diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 12:47:39 +0000 |
| commit | cb897b8ffca0a68c017c2edfa523cb5ff0491962 (patch) | |
| tree | 8b4e9e320258d5280ce454163c49363030626c1a /libX11/modules/om/generic/omXChar.c | |
| parent | 213d71f78d6f9e35b23c00e35f9919efc9670b1e (diff) | |
| parent | c87efef42f76c2ff0dcfad2842ab369beffd21de (diff) | |
| download | vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.gz vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.tar.bz2 vcxsrv-cb897b8ffca0a68c017c2edfa523cb5ff0491962.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'libX11/modules/om/generic/omXChar.c')
| -rw-r--r-- | libX11/modules/om/generic/omXChar.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libX11/modules/om/generic/omXChar.c b/libX11/modules/om/generic/omXChar.c index c910cfed4..b15ff4ddf 100644 --- a/libX11/modules/om/generic/omXChar.c +++ b/libX11/modules/om/generic/omXChar.c @@ -120,7 +120,7 @@ _XomGetFontDataFromFontSet( unsigned char *str, int len, int *len_ret, - int is2b, + int is2b, int type) /* VMAP , VROTATE , else */ { unsigned long value; @@ -128,7 +128,7 @@ _XomGetFontDataFromFontSet( FontData fontdata; unsigned char *c; int vfont_type; - + c = str; hit = -1; if(type == VMAP){ @@ -164,7 +164,7 @@ _XomGetFontDataFromFontSet( } else { value = (unsigned long)*c; } - + /* ### NOTE: This routine DOES NOT WORK! * ### We can work around the problem in the calling routine, * ### but we really need to understand this better. As it @@ -332,7 +332,7 @@ load_font( oc->core.font_info.font_name_list[font_set->id]); if (font_set->font == NULL) return False; - + oc->core.font_info.font_struct_list[font_set->id] = font_set->font; XFreeFontInfo(NULL, font_set->info, 1); font_set->info = NULL; @@ -364,7 +364,7 @@ _XomConvert( XChar2b *xchar2b; char *buf, buf_local[BUFSIZ]; #endif - + cs = *to; cs_left = *to_left; lc_args[0] = (XPointer) &charset; @@ -400,7 +400,7 @@ _XomConvert( cs_to_xchar2b_gr(buf, xchar2b, length); else cs_to_xchar2b(buf, xchar2b, length); - + if (buf != buf_local) Xfree(buf); |