diff options
author | Owen Taylor <otaylor@redhat.com> | 2000-02-16 22:05:43 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2000-02-16 22:05:43 +0000 |
commit | 7f846326d416e9ab3eadca9f02b9a0129095f30b (patch) | |
tree | 4b2812b858cd830ca1282e3697d029ca347df24a /pango/shape.c | |
parent | 4f335d6e4a3f5b4e6ddd1cd78f919aa80c990262 (diff) | |
download | pango-7f846326d416e9ab3eadca9f02b9a0129095f30b.tar.gz |
Make refcounted.
Wed Feb 16 16:39:46 2000 Owen Taylor <otaylor@redhat.com>
* libpango/pango-coverage.c (pango_coverage_get): Make refcounted.
* libpango/modules.c (struct _PangoEnginePair): Since we don't
currently unload engines, cache loaded engines. (Not really
quite satisfactory, but should work OK)
* libpango/pango-context.c (pango_context_get_font_description):
Added a global font description.
* libpango/modules.c (_pango_find_map): Allow NULL
language tags.
* libpango/pango-context.c (pango_itemize) examples/viewer.c:
Switch itemize over to take a PangoAttrList.
* examples/viewer.c: Conform to changes in itemization interface
* libpango/font.[ch]: Add a compare function for FontDescription
* libpango/pango-attributes.[ch]: Change the iteration iterface
to be more convenient.
* libpango/pango-context.[ch]: Add the ability to set a default font.
* libpango/pango-context.[ch]: Take the font for itemization from
the attributes on the text.
* libpango/pangox.c: Cache currently loaded fonts, and cache
coverages.
Diffstat (limited to 'pango/shape.c')
-rw-r--r-- | pango/shape.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pango/shape.c b/pango/shape.c index 0f5efb39..04a966e0 100644 --- a/pango/shape.c +++ b/pango/shape.c @@ -24,7 +24,6 @@ /** * pango_shape: - * @font: font to use for shaping * @text: the text to process * @length: the length (in bytes) of @text * @analysis: #PangoAnalysis structure from PangoItemize @@ -35,14 +34,13 @@ * convert the characters into glyphs. You may also pass * in only a substring of the item from pango_itemize(). */ -void pango_shape (PangoFont *font, - gchar *text, - gint length, - PangoAnalysis *analysis, - PangoGlyphString *glyphs) +void pango_shape (gchar *text, + gint length, + PangoAnalysis *analysis, + PangoGlyphString *glyphs) { if (analysis->shape_engine) - analysis->shape_engine->script_shape (font, text, length, analysis, glyphs); + analysis->shape_engine->script_shape (analysis->font, text, length, analysis, glyphs); else pango_glyph_string_set_size (glyphs, 0); } |