Mercurial > mplayer.hg

changeset 30007:f66242c2b3b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics: reindent
author adrian
date Thu, 17 Dec 2009 10:57:40 +0000
parents 73d653fd865f
children 26fb866475a7
files libvo/font_load_ft.c
diffstat 1 files changed, 22 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/font_load_ft.c	Thu Dec 17 02:16:12 2009 +0000
+++ b/libvo/font_load_ft.c	Thu Dec 17 10:57:40 2009 +0000
@@ -1163,28 +1163,28 @@
 	FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
 	FcDefaultSubstitute(fc_pattern);
 	fc_pattern2 = fc_pattern;
-	fc_pattern = FcFontMatch(0, fc_pattern, &result);
-	if (fc_pattern) {
-	FcPatternDestroy(fc_pattern2);
-	FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable);
-	if (scalable != FcTrue) {
-	    FcPatternDestroy(fc_pattern);
-    	    fc_pattern = FcNameParse("sans-serif");
-    	    FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
-    	    FcDefaultSubstitute(fc_pattern);
-	    fc_pattern2 = fc_pattern;
-    	    fc_pattern = FcFontMatch(0, fc_pattern, 0);
-	    FcPatternDestroy(fc_pattern2);
-	}
-	// s doesn't need to be freed according to fontconfig docs
-	FcPatternGetString(fc_pattern, FC_FILE, 0, &s);
-	FcPatternGetInteger(fc_pattern, FC_INDEX, 0, &face_index);
-	*fontp=read_font_desc_ft(s, face_index, width, height, font_scale_factor);
-	FcPatternDestroy(fc_pattern);
-	return;
-	}
-	// Failed to match any font, try without fontconfig
-	mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_FontconfigNoMatch);
+        fc_pattern = FcFontMatch(0, fc_pattern, &result);
+        if (fc_pattern) {
+            FcPatternDestroy(fc_pattern2);
+            FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable);
+            if (scalable != FcTrue) {
+                FcPatternDestroy(fc_pattern);
+                fc_pattern = FcNameParse("sans-serif");
+                FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
+                FcDefaultSubstitute(fc_pattern);
+                fc_pattern2 = fc_pattern;
+                fc_pattern = FcFontMatch(0, fc_pattern, 0);
+                FcPatternDestroy(fc_pattern2);
+            }
+            // s doesn't need to be freed according to fontconfig docs
+            FcPatternGetString(fc_pattern, FC_FILE, 0, &s);
+            FcPatternGetInteger(fc_pattern, FC_INDEX, 0, &face_index);
+            *fontp=read_font_desc_ft(s, face_index, width, height, font_scale_factor);
+            FcPatternDestroy(fc_pattern);
+            return;
+        }
+        // Failed to match any font, try without fontconfig
+        mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_FontconfigNoMatch);
     }
 #endif
     *fontp=read_font_desc_ft(font_name, 0, width, height, font_scale_factor);