[cairo-commit] cairo/src cairo_ft_font.c,1.34,1.35

[Dave Beckett]

Committed by: dajobe

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv22045

Modified Files:
	cairo_ft_font.c 
Log Message:
2005-01-23  Dave Beckett  <Dave.Beckett at bristol.ac.uk>

	* src/cairo_ft_font.c (_get_load_flags): Protect switch on
	hintstyle with #ifdef FC_HINT_STYLE.


Index: cairo_ft_font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_ft_font.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- cairo_ft_font.c	21 Jan 2005 23:31:16 -0000	1.34
+++ cairo_ft_font.c	23 Jan 2005 23:17:05 -0000	1.35
@@ -517,10 +517,6 @@
 
     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 @@
 	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,