[MPlayer-cvslog] r22475 - trunk/libass/ass_render.c

[eugeni]

Author: eugeni
Date: Tue Mar  6 11:00:53 2007
New Revision: 22475

Modified:
   trunk/libass/ass_render.c

Log:
A function always returning 0 could as well return void.


Modified: trunk/libass/ass_render.c
==============================================================================
--- trunk/libass/ass_render.c	(original)
+++ trunk/libass/ass_render.c	Tue Mar  6 11:00:53 2007
@@ -1226,7 +1226,7 @@ static void free_render_context(void)
  * \param advance advance vector of the extracted glyph
  * \return 0 on success
  */
-static int get_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
+static void get_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
 {
 	int error;
 	glyph_hash_val_t* val;
@@ -1258,7 +1258,7 @@ static int get_glyph(int symbol, glyph_i
 		info->advance.x = val->advance.x;
 		info->advance.y = val->advance.y;
 
-		return 0;
+		return;
 	}
 
 	// not found, get a new outline glyph from face
@@ -1270,7 +1270,7 @@ static int get_glyph(int symbol, glyph_i
 	
 	info->glyph = ass_font_get_glyph(frame_context.ass_priv->fontconfig_priv, render_context.font, symbol);
 	if (!info->glyph)
-		return 0;
+		return;
 
 	info->advance.x = d16_to_d6(info->glyph->advance.x);
 	info->advance.y = d16_to_d6(info->glyph->advance.y);
@@ -1282,8 +1282,6 @@ static int get_glyph(int symbol, glyph_i
 			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FT_Glyph_Stroke_Error, error);
 		}
 	}
-
-	return 0;
 }
 
 /**
@@ -1651,7 +1649,6 @@ static int ass_render_event(ass_event_t*
 	FT_UInt previous; 
 	FT_UInt num_glyphs;
 	FT_Vector pen;
-	int error;
 	unsigned code;
 	FT_BBox bbox;
 	int i, j;
@@ -1719,11 +1716,7 @@ static int ass_render_event(ass_event_t*
 			ass_font_set_transform(render_context.font, &matrix, &shift );
 		}
 		
-		error = get_glyph(code, text_info.glyphs + text_info.length, &shift);
-
-		if (error) {
-			continue;
-		}
+		get_glyph(code, text_info.glyphs + text_info.length, &shift);
 		
 		text_info.glyphs[text_info.length].pos.x = pen.x >> 6;
 		text_info.glyphs[text_info.length].pos.y = pen.y >> 6;