diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2010-06-15 10:54:36 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2010-06-15 10:54:36 -0400 |
| commit | 7dc0bb2b5aab78d8d7a299b54351bb0e9a4e888d (patch) | |
| tree | c31624dce33d214a55d4d999146d6c80645c5a2b /pango/pangofc-private.h | |
| parent | a4ebb72cfb8814a4d3aee9fd0a02a56e998fe6c6 (diff) | |
| parent | cf1022c02c89d50a64743b1cf8d989817e4e1fd1 (diff) | |
| download | pango-7dc0bb2b5aab78d8d7a299b54351bb0e9a4e888d.tar.gz | |
Merge branch 'master' into 1.28
Conflicts:
pango/Makefile.am
Diffstat (limited to 'pango/pangofc-private.h')
| -rw-r--r-- | pango/pangofc-private.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/pangofc-private.h b/pango/pangofc-private.h index e7c08bff..f200c8c0 100644 --- a/pango/pangofc-private.h +++ b/pango/pangofc-private.h @@ -90,8 +90,8 @@ void pango_fc_font_get_raw_extents (PangoFcFont *font, PangoRectangle *ink_rect, PangoRectangle *logical_rect); -PangoFontMetrics *pango_fc_font_create_metrics_for_context (PangoFcFont *font, - PangoContext *context); +PangoFontMetrics *pango_fc_font_create_base_metrics_for_context (PangoFcFont *font, + PangoContext *context); |