Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-01 23:06:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix undefined reference XGetUtf8FontAndGlyph (STR #3191).

Browse Source 
XGetUtf8FontAndGlyph was referenced in libfltk_gl if configured w/o xft
and defined in libfltk, but not exported (regression since 1.3.3).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10588 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser
2015-02-22 13:26:00 +00:00
parent 958d912ffc
commit 46f8f4bcb4
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Xutf8.h
+3 -2
View File
@@ -25,6 +25,7 @@ extern "C" {
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xlocale.h> #include <X11/Xlocale.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <FL/Fl_Export.H>
typedef struct { typedef struct {
int nb_font; int nb_font;
@@ -98,8 +99,8 @@ XUtf8UcsWidth(
XUtf8FontStruct *font_set, XUtf8FontStruct *font_set,
unsigned int ucs); unsigned int ucs);
int FL_EXPORT int
XGetUtf8FontAndGlyph( fl_XGetUtf8FontAndGlyph(
XUtf8FontStruct *font_set, XUtf8FontStruct *font_set,
unsigned int ucs, unsigned int ucs,
XFontStruct **fnt, XFontStruct **fnt,
src/gl_draw.cxx
+1 -1
View File
@@ -114,7 +114,7 @@ static void get_list(int r) {
for (int i = 0; i < 0x400; i++) { for (int i = 0; i < 0x400; i++) {
XFontStruct *font = NULL; XFontStruct *font = NULL;
unsigned short id; unsigned short id;
XGetUtf8FontAndGlyph(gl_fontsize->font, ii, &font, &id); fl_XGetUtf8FontAndGlyph(gl_fontsize->font, ii, &font, &id);
if (font) glXUseXFont(font->fid, id, 1, gl_fontsize->listbase+ii); if (font) glXUseXFont(font->fid, id, 1, gl_fontsize->listbase+ii);
ii++; ii++;
} }
src/xutf8/utf8Wrap.c
+1 -1
View File
@@ -816,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct *font_set,
/** get the X font and glyph ID of a UCS char **/ /** get the X font and glyph ID of a UCS char **/
/*****************************************************************************/ /*****************************************************************************/
int int
XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, fl_XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set,
unsigned int ucs, unsigned int ucs,
XFontStruct **fnt, XFontStruct **fnt,
unsigned short *id) { unsigned short *id) {