diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-04-06 20:09:31 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-04-06 20:09:31 +0000 |
| commit | 2ea732bb050bb59f3ecad782b7ff8b7d39034c03 (patch) | |
| tree | e6267c8328ee285bc1c16d40aec189a819d3d35e | |
| parent | 81d293ac32fc00207f2f10fc11fd09672d0d2d87 (diff) | |
| download | pango-2ea732bb050bb59f3ecad782b7ff8b7d39034c03.tar.gz | |
Bug 337502 – Win32 build fix Patch from Alexander Larsson.
2006-04-06 Behdad Esfahbod <behdad@gnome.org>
Bug 337502 – Win32 build fix
Patch from Alexander Larsson.
* pango/pangocairo-fontmap.c: Fix order of checking for freetype and
win32 cairo backends to match the constructor.
* pango/pangoft2.def: Add missing symbol
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | pango/pangocairo-fontmap.c | 4 | ||||
| -rw-r--r-- | pango/pangoft2.def | 1 |
3 files changed, 13 insertions, 2 deletions
@@ -1,5 +1,15 @@ 2006-04-06 Behdad Esfahbod <behdad@gnome.org> + Bug 337502 – Win32 build fix + Patch from Alexander Larsson. + + * pango/pangocairo-fontmap.c: Fix order of checking for freetype and + win32 cairo backends to match the constructor. + + * pango/pangoft2.def: Add missing symbol + +2006-04-06 Behdad Esfahbod <behdad@gnome.org> + * pango/opentype: Update from HarfBuzz. Lars Knoll fixed all the warnings. diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index 1fc665e1..bd53063b 100644 --- a/pango/pangocairo-fontmap.c +++ b/pango/pangocairo-fontmap.c @@ -27,10 +27,10 @@ #if defined (HAVE_CAIRO_ATSUI) # include "pangocairo-atsui.h" -#elif defined (HAVE_CAIRO_FREETYPE) -# include "pangocairo-fc.h" #elif defined (HAVE_CAIRO_WIN32) # include "pangocairo-win32.h" +#elif defined (HAVE_CAIRO_FREETYPE) +# include "pangocairo-fc.h" #endif GType diff --git a/pango/pangoft2.def b/pango/pangoft2.def index 01df2e09..b559627a 100644 --- a/pango/pangoft2.def +++ b/pango/pangoft2.def @@ -1,6 +1,7 @@ EXPORTS pango_fc_decoder_get_charset pango_fc_decoder_get_glyph + pango_fc_font_create_metrics_for_context pango_fc_font_description_from_pattern pango_fc_font_get_glyph pango_fc_font_get_raw_extents |