From 6cda07fc3cc84339fda8c9335db521c7d1c1f9ba Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 23 Jan 2007 17:29:39 +0000 Subject: =?UTF-8?q?Bug=20399738=20=E2=80=93=20pango=201.15.5=20won't=20com?= =?UTF-8?q?pile=20on=20Mac=20OS=20X:=20'FC=5FHINT=5FSTYLE'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2007-01-23 Behdad Esfahbod Bug 399738 – pango 1.15.5 won't compile on Mac OS X: 'FC_HINT_STYLE' undeclared (first use in this function) * pango/pangoft2.c (pango_ft2_font_get_face): Don't use FC_HINT_STYLE if it's not defined (old fontconfig versions). svn path=/trunk/; revision=2183 --- ChangeLog | 8 ++++++++ pango/pangoft2.c | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index fe50a051..15e2c6cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-01-23 Behdad Esfahbod + + Bug 399738 – pango 1.15.5 won't compile on Mac OS X: 'FC_HINT_STYLE' + undeclared (first use in this function) + + * pango/pangoft2.c (pango_ft2_font_get_face): Don't use FC_HINT_STYLE + if it's not defined (old fontconfig versions). + 2007-01-22 Behdad Esfahbod * === Released 1.15.5 === diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 25144dbf..f23f1ed9 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -207,6 +207,7 @@ pango_ft2_font_get_face (PangoFont *font) FC_HINTING, 0, &hinting) != FcResultMatch) hinting = FcTrue; +#ifdef FC_HINT_STYLE if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch) hintstyle = FC_HINT_FULL; @@ -222,6 +223,10 @@ pango_ft2_font_get_face (PangoFont *font) ft2font->load_flags |= FT_LOAD_TARGET_NORMAL; break; } +#else + if (!hinting) + ft2font->load_flags |= FT_LOAD_NO_HINTING; +#endif /* force autohinting if requested */ if (FcPatternGetBool (pattern, -- cgit v1.2.1