Mercurial > mplayer.hg

changeset 26825:13ef1f050cfc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics: reindent after the last commit.
author eugeni
date Thu, 22 May 2008 22:52:58 +0000
parents 6112b693fab9
children 039574a7dc1e
files libass/ass_fontconfig.c
diffstat 1 files changed, 25 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass_fontconfig.c	Thu May 22 22:52:57 2008 +0000
+++ b/libass/ass_fontconfig.c	Thu May 22 22:52:58 2008 +0000
@@ -354,35 +354,35 @@
 	int face_index, num_faces = 1;
 
 	for (face_index = 0; face_index < num_faces; ++face_index) {
-	rc = FT_New_Memory_Face(ftlibrary, (unsigned char*)data, data_size, face_index, &face);
-	if (rc) {
-		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorOpeningMemoryFont, name);
-		return;
-	}
-	num_faces = face->num_faces;
+		rc = FT_New_Memory_Face(ftlibrary, (unsigned char*)data, data_size, face_index, &face);
+		if (rc) {
+			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorOpeningMemoryFont, name);
+			return;
+		}
+		num_faces = face->num_faces;
 
-	pattern = FcFreeTypeQueryFace(face, (unsigned char*)name, 0, FcConfigGetBlanks(priv->config));
-	if (!pattern) {
-		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed, "FcFreeTypeQueryFace");
-		FT_Done_Face(face);
-		return;
-	}
+		pattern = FcFreeTypeQueryFace(face, (unsigned char*)name, 0, FcConfigGetBlanks(priv->config));
+		if (!pattern) {
+			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed, "FcFreeTypeQueryFace");
+			FT_Done_Face(face);
+			return;
+		}
 
-	fset = FcConfigGetFonts(priv->config, FcSetSystem); // somehow it failes when asked for FcSetApplication
-	if (!fset) {
-		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed, "FcConfigGetFonts");
-		FT_Done_Face(face);
-		return;
-	}
+		fset = FcConfigGetFonts(priv->config, FcSetSystem); // somehow it failes when asked for FcSetApplication
+		if (!fset) {
+			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed, "FcConfigGetFonts");
+			FT_Done_Face(face);
+			return;
+		}
 
-	res = FcFontSetAdd(fset, pattern);
-	if (!res) {
-		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed, "FcFontSetAdd");
+		res = FcFontSetAdd(fset, pattern);
+		if (!res) {
+			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed, "FcFontSetAdd");
+			FT_Done_Face(face);
+			return;
+		}
+
 		FT_Done_Face(face);
-		return;
-	}
-
-	FT_Done_Face(face);
 	}
 #endif
 }