From decaaae4ddecb4b2acc3badec1c1390cf85df0ae Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 6 Apr 2006 20:11:25 +0000 Subject: =?UTF-8?q?Bug=20337502=20=E2=80=93=20Win32=20build=20fix=20Patch?= =?UTF-8?q?=20from=20Alexander=20Larsson.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2006-04-06 Behdad Esfahbod 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 --- ChangeLog | 10 ++++++++++ pango/pangocairo-fontmap.c | 4 ++-- pango/pangoft2.def | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee2233ea..f54d3fa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-04-06 Behdad Esfahbod + + 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-01 Tor Lillqvist Fix blurred underlines on Win32 (#332656): diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c index b7525b1a..3ee1c62b 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 -- cgit v1.2.1