diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-07-22 19:05:45 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-07-22 19:05:45 +0000 |
| commit | 516a1c99afa7bb832e9edc69551b74d973ce75a3 (patch) | |
| tree | c7b1cc8a8b4ec6d0cdb775856804a5a1607cce75 /pango/pangox-fontmap.c | |
| parent | a998706c418584d6776e613925e8d7e633eebe8c (diff) | |
| download | pango-516a1c99afa7bb832e9edc69551b74d973ce75a3.tar.gz | |
Use -export-symbols-regex to control symbol exports, including not
2005-07-22 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.a configure.in: Use -export-symbols-regex
to control symbol exports, including not exporting the symbols
from opentype/.
* modules/*/Makefile.am: Control symbol exports here as well,
simplify using AC_SUBST() of MODULE_LIBTOOL_OPTIONS from configure.in.
* pango/pangox-fontmap.c (engine_shape_covers): Cut-and-paste
engine_shape_covers to avoid using a symbol from libpango.
* pango/pango-utils.c: Make accidentally exported pango_aliases_ht
static.
Diffstat (limited to 'pango/pangox-fontmap.c')
| -rw-r--r-- | pango/pangox-fontmap.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c index 0227da28..aaa28aad 100644 --- a/pango/pangox-fontmap.c +++ b/pango/pangox-fontmap.c @@ -1512,6 +1512,22 @@ pango_x_face_get_type (void) return object_type; } +/* Cut and paste here to avoid an inter-module dependency */ +static PangoCoverageLevel +engine_shape_covers (PangoEngineShape *engine, + PangoFont *font, + PangoLanguage *language, + gunichar wc) +{ + g_return_val_if_fail (PANGO_IS_ENGINE_SHAPE (engine), PANGO_COVERAGE_NONE); + g_return_val_if_fail (PANGO_IS_FONT (font), PANGO_COVERAGE_NONE); + + return PANGO_ENGINE_SHAPE_GET_CLASS (engine)->covers (engine, + font, + language, + wc); +} + PangoCoverage * pango_x_face_get_coverage (PangoXFace *xface, PangoFont *font, @@ -1558,7 +1574,7 @@ pango_x_face_get_coverage (PangoXFace *xface, { PangoCoverageLevel level; - level = _pango_engine_shape_covers (engine, font, language, wc); + level = engine_shape_covers (engine, font, language, wc); if (level != PANGO_COVERAGE_NONE) pango_coverage_set (result, wc, level); } |