summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-17 10:57:40 +0000
committeradrian <adrian@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-17 10:57:40 +0000
commitd8fed1f04c621a48f3294d3df5c6ed47867bd328 (patch)
treebcf926c9289601f33718f651f07d0d3a4c48eb9f
parent9182f6a97cf894fa57a266fa15aa2d21cbfceb22 (diff)
downloadmpv-d8fed1f04c621a48f3294d3df5c6ed47867bd328.tar.bz2
mpv-d8fed1f04c621a48f3294d3df5c6ed47867bd328.tar.xz
Cosmetics: reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30049 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libvo/font_load_ft.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
index 771177eb96..2b4caad215 100644
--- a/libvo/font_load_ft.c
+++ b/libvo/font_load_ft.c
@@ -1163,28 +1163,28 @@ void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_n
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);