diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-06-28 15:15:53 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-07-02 10:09:08 -0700 |
| commit | a00066d2916b6910429cc1c7feedafbaee0d4750 (patch) | |
| tree | 4a81771b0db3f43c8e104370c01a45e0e7c6d159 | |
| parent | 212b9803238d2de2e77cbe5de62d3f616ae50daf (diff) | |
Add dixGetGlyphs to replace GetGlyphs from libXfont to simplify linking
No other Xfont consumer used it, and this saves us from having to link
callers against libXfont for one simple function when doing
-no-undefined symbols builds.
The function is given a new name to avoid clashing with existing libXfont
binaries, but a #define is provided to preserve the API so we don't have
to fix all the callers at the same time.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
| -rw-r--r-- | dix/dixfonts.c | 9 | ||||
| -rw-r--r-- | include/dixfont.h | 13 |
2 files changed, 16 insertions, 6 deletions
diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 19fd31e3e..dd9331195 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -115,6 +115,15 @@ LoadGlyphs(ClientPtr client, FontPtr pfont, unsigned nchars, int item_size, return Successful; } +void +dixGetGlyphs(FontPtr font, unsigned long count, unsigned char *chars, + FontEncoding fontEncoding, + unsigned long *glyphcount, /* RETURN */ + CharInfoPtr *glyphs) /* RETURN */ +{ + (*font->get_glyphs) (font, count, chars, fontEncoding, glyphcount, glyphs); +} + /* * adding RT_FONT prevents conflict with default cursor font */ diff --git a/include/dixfont.h b/include/dixfont.h index 9333041fb..3d09eb5ae 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -117,12 +117,13 @@ extern _X_EXPORT void FreeFonts(void); extern _X_EXPORT FontPtr find_old_font(XID /*id */ ); -extern _X_EXPORT void GetGlyphs(FontPtr /*font */ , - unsigned long /*count */ , - unsigned char * /*chars */ , - FontEncoding /*fontEncoding */ , - unsigned long * /*glyphcount */ , - CharInfoPtr * /*glyphs */ ); +#define GetGlyphs dixGetGlyphs +extern _X_EXPORT void dixGetGlyphs(FontPtr /*font */ , + unsigned long /*count */ , + unsigned char * /*chars */ , + FontEncoding /*fontEncoding */ , + unsigned long * /*glyphcount */ , + CharInfoPtr * /*glyphs */ ); extern _X_EXPORT void QueryGlyphExtents(FontPtr /*pFont */ , CharInfoPtr * /*charinfo */ , |