diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
| commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/omText.c | |
| parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
| parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
| download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip | |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/omText.c')
| -rw-r--r-- | nx-X11/lib/X11/omText.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/lib/X11/omText.c b/nx-X11/lib/X11/omText.c index 676edde6e..bfceca96e 100644 --- a/nx-X11/lib/X11/omText.c +++ b/nx-X11/lib/X11/omText.c @@ -108,7 +108,7 @@ draw_vertical( int direction = 0; int font_ascent_return = 0, font_descent_return = 0; int i; - XCharStruct overall; + XCharStruct overall; wy = y; if (is_xchar2b) { @@ -190,7 +190,7 @@ DrawStringWithFontSet( * If it was, use that font. If it was not set, then use the * font defined by font_set->font_data[0] (which is what * _XomGetFontDataFromFontSet() always seems to return for - * non-VW text). Note that given the new algorithm in + * non-VW text). Note that given the new algorithm in * parse_fontname() and parse_fontdata(), fs->font will * *always* contain good data. We should probably remove * the check for "fd->font", but we won't :-) -- jjw/pma (HP) @@ -305,7 +305,7 @@ _XomGenericDrawString( conv = _XomInitConverter(oc, type); if (conv == NULL) return -1; - + args[0] = (XPointer) &font; args[1] = (XPointer) &is_xchar2b; args[2] = (XPointer) &fs; |