diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-01-23 17:29:39 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-01-23 17:29:39 +0000 |
| commit | 6cda07fc3cc84339fda8c9335db521c7d1c1f9ba (patch) | |
| tree | 394a5a914cf8feb6b48649b03173a6a004a92b42 | |
| parent | 90455c27d8745b71558812c8c73df492a32041a3 (diff) | |
| download | pango-6cda07fc3cc84339fda8c9335db521c7d1c1f9ba.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | pango/pangoft2.c | 5 |
2 files changed, 13 insertions, 0 deletions
@@ -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 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, |