A function always returning 0 could as well return void.
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Tue, 6 Mar 2007 10:00:53 +0000 (10:00 +0000)
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Tue, 6 Mar 2007 10:00:53 +0000 (10:00 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@22475 b3059339-0415-0410-9bf9-f77b7e298cf2

libass/ass_render.c

index c240e65..1fb35c7 100644 (file)
@@ -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_info_t* info, FT_Vector* advance)
                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_info_t* info, FT_Vector* advance)
        
        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_info_t* info, FT_Vector* advance)
                        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* event, event_images_t* event_images)
        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* event, event_images_t* event_images)
                        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;