From: Michael van Elst <[email protected]> This will almost always select the wrong fontset and use wrong metrics.
Signed-off-by: Thomas Klausner <[email protected]> --- src/util.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/util.c b/src/util.c index 9e5675a..4b94051 100644 --- a/src/util.c +++ b/src/util.c @@ -589,17 +589,13 @@ GetFont(MyFont *font) int ascent; int descent; int fnum; - char *basename2; if (use_fontset) { if (font->fontset != NULL){ XFreeFontSet(dpy, font->fontset); } - basename2 = malloc(strlen(font->name) + 3); - if (basename2) sprintf(basename2, "%s,*", font->name); - else basename2 = font->name; - if( (font->fontset = XCreateFontSet(dpy, basename2, + if( (font->fontset = XCreateFontSet(dpy, font->name, &missing_charset_list_return, &missing_charset_count_return, &def_string_return)) == NULL) { @@ -607,7 +603,6 @@ GetFont(MyFont *font) ProgramName, font->name); exit(1); } - if (basename2 != font->name) free(basename2); for(i=0; i<missing_charset_count_return; i++){ printf("%s: warning: font for charset %s is lacking.\n", ProgramName, missing_charset_list_return[i]); -- 2.4.6 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
