Bug 399738 – pango 1.15.5 won't compile on Mac OS X: 'FC_HINT_STYLE'

2007-01-23  Behdad Esfahbod  <behdad@gnome.org>

        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

diff --git a/ChangeLog b/ChangeLog
index fe50a05..15e2c6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-23  Behdad Esfahbod  <behdad@gnome.org>
+
+       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  <behdad@gnome.org>
 
        * === Released 1.15.5 ===

diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 25144db..f23f1ed 100644 (file)
--- 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,