diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 2004-06-21 18:39:14 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-06-21 18:39:14 +0000 |
| commit | b247ac6629605fa106178aee55ff1a8407e9ce0b (patch) | |
| tree | 6d0dce9e7d5364642e4dec47148573732d5a1da2 | |
| parent | de7871cdd4847fc2ccca73ac61f9ec21d333d2ab (diff) | |
| download | pango-b247ac6629605fa106178aee55ff1a8407e9ce0b.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 11 | ||||
| -rw-r--r-- | pango/pangofc-font.h | 6 | ||||
| -rw-r--r-- | pango/pangoft2.c | 4 |
6 files changed, 50 insertions, 4 deletions
@@ -1,3 +1,14 @@ +Mon Jun 21 14:34:34 2004 Owen Taylor <otaylor@redhat.com> + + #142355, Sven Neumann + + * pango/pangoft2.c (pango_ft2_font_get_face): Mention + pango_fc_font_lock/unlock face as the correct + replacements. + + * pango/pangofc-font.h: Move lock/unlock_face outside + of the #ifdef PANGO_ENABLE_ENGINE. + Mon Jun 21 14:23:05 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (no_shape_filter_func) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c0e7b061..38fbd5ca 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,14 @@ +Mon Jun 21 14:34:34 2004 Owen Taylor <otaylor@redhat.com> + + #142355, Sven Neumann + + * pango/pangoft2.c (pango_ft2_font_get_face): Mention + pango_fc_font_lock/unlock face as the correct + replacements. + + * pango/pangofc-font.h: Move lock/unlock_face outside + of the #ifdef PANGO_ENABLE_ENGINE. + Mon Jun 21 14:23:05 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (no_shape_filter_func) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index c0e7b061..38fbd5ca 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,14 @@ +Mon Jun 21 14:34:34 2004 Owen Taylor <otaylor@redhat.com> + + #142355, Sven Neumann + + * pango/pangoft2.c (pango_ft2_font_get_face): Mention + pango_fc_font_lock/unlock face as the correct + replacements. + + * pango/pangofc-font.h: Move lock/unlock_face outside + of the #ifdef PANGO_ENABLE_ENGINE. + Mon Jun 21 14:23:05 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (no_shape_filter_func) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index c0e7b061..38fbd5ca 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,14 @@ +Mon Jun 21 14:34:34 2004 Owen Taylor <otaylor@redhat.com> + + #142355, Sven Neumann + + * pango/pangoft2.c (pango_ft2_font_get_face): Mention + pango_fc_font_lock/unlock face as the correct + replacements. + + * pango/pangofc-font.h: Move lock/unlock_face outside + of the #ifdef PANGO_ENABLE_ENGINE. + Mon Jun 21 14:23:05 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (no_shape_filter_func) diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h index c10605cf..927a4685 100644 --- a/pango/pangofc-font.h +++ b/pango/pangofc-font.h @@ -123,8 +123,6 @@ struct _PangoFcFontClass #endif /* PANGO_ENABLE_BACKEND */ -FT_Face pango_fc_font_lock_face (PangoFcFont *font); -void pango_fc_font_unlock_face (PangoFcFont *font); gboolean pango_fc_font_has_char (PangoFcFont *font, gunichar wc); guint pango_fc_font_get_glyph (PangoFcFont *font, @@ -138,6 +136,8 @@ void pango_fc_font_kern_glyphs (PangoFcFont *font, GType pango_fc_font_get_type (void); -G_END_DECLS +FT_Face pango_fc_font_lock_face (PangoFcFont *font); +void pango_fc_font_unlock_face (PangoFcFont *font); +G_END_DECLS #endif /* __PANGO_FC_FONT_H__ */ diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 53601cac..3963299e 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -184,7 +184,9 @@ set_transform (PangoFT2Font *ft2font) * Returns the native FreeType2 FT_Face structure used for this PangoFont. * This may be useful if you want to use FreeType2 functions directly. * - * Use pango_fc_font_get_face() instead. + * Use pango_fc_font_lock_face() instead; when you are done with a + * face from pango_fc_font_lock_face() you must call + * pango_fc_font_unlock_face(). * * Return value: a pointer to a #FT_Face structure, with the size set correctly **/ |