summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-04-06 20:11:25 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-04-06 20:11:25 +0000
commitdecaaae4ddecb4b2acc3badec1c1390cf85df0ae (patch)
tree941ac871346441744a2258cb65e00605fd2d9fb5
parentf4864b10a11b203347d7fa7ed41a499b76d62d88 (diff)
downloadpango-decaaae4ddecb4b2acc3badec1c1390cf85df0ae.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--ChangeLog10
-rw-r--r--pango/pangocairo-fontmap.c4
-rw-r--r--pango/pangoft2.def1
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 <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-01 Tor Lillqvist <tml@novell.com>
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