From c58f6a4bcf20b1f2a50629100457e4025a7de19b Mon Sep 17 00:00:00 2001 From: Dave Beckett Date: Sun, 23 Jan 2005 15:16:57 +0000 Subject: [PATCH] Protect switch on hintstyle with #ifdef FC_HINT_STYLE. --- ChangeLog | 5 +++++ src/cairo-ft-font.c | 8 ++++---- src/cairo_ft_font.c | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 280e2b1ba..df23d033a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-23 Dave Beckett + + * src/cairo_ft_font.c (_get_load_flags): Protect switch on + hintstyle with #ifdef FC_HINT_STYLE. + 2005-01-23 Carl Worth * RELEASING: Add instructions for handling the new "-head" suffix diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index 861af082c..dca6adc8d 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -517,10 +517,6 @@ _get_load_flags (FcPattern *pattern) if (!hinting || hintstyle == FC_HINT_NONE) load_flags |= FT_LOAD_NO_HINTING; -#else /* !FC_HINT_STYLE */ - if (!hinting) - load_flags |= FT_LOAD_NO_HINTING; -#endif /* FC_FHINT_STYLE */ switch (hintstyle) { case FC_HINT_SLIGHT: @@ -531,6 +527,10 @@ _get_load_flags (FcPattern *pattern) load_flags |= FT_LOAD_TARGET_NORMAL; break; } +#else /* !FC_HINT_STYLE */ + if (!hinting) + load_flags |= FT_LOAD_NO_HINTING; +#endif /* FC_FHINT_STYLE */ /* force autohinting if requested */ if (FcPatternGetBool (pattern, diff --git a/src/cairo_ft_font.c b/src/cairo_ft_font.c index 861af082c..dca6adc8d 100644 --- a/src/cairo_ft_font.c +++ b/src/cairo_ft_font.c @@ -517,10 +517,6 @@ _get_load_flags (FcPattern *pattern) if (!hinting || hintstyle == FC_HINT_NONE) load_flags |= FT_LOAD_NO_HINTING; -#else /* !FC_HINT_STYLE */ - if (!hinting) - load_flags |= FT_LOAD_NO_HINTING; -#endif /* FC_FHINT_STYLE */ switch (hintstyle) { case FC_HINT_SLIGHT: @@ -531,6 +527,10 @@ _get_load_flags (FcPattern *pattern) load_flags |= FT_LOAD_TARGET_NORMAL; break; } +#else /* !FC_HINT_STYLE */ + if (!hinting) + load_flags |= FT_LOAD_NO_HINTING; +#endif /* FC_FHINT_STYLE */ /* force autohinting if requested */ if (FcPatternGetBool (pattern,