summaryrefslogtreecommitdiffstats
path: root/libass/ass_render.c
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-20 23:10:33 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-20 23:10:33 +0000
commitd9741a027806458e5b41283760c71e107e84a000 (patch)
tree7462d105da1d6e9b8531e8db964ca48d37f52b78 /libass/ass_render.c
parent1c2b1740296d14f6108dd9549c386f42f697e68a (diff)
downloadmpv-d9741a027806458e5b41283760c71e107e84a000.tar.bz2
mpv-d9741a027806458e5b41283760c71e107e84a000.tar.xz
Make get_*_glyph return void.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23040 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass/ass_render.c')
-rw-r--r--libass/ass_render.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c
index b62ba5ac06..eafcd9668e 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -1224,7 +1224,7 @@ static void free_render_context(void)
{
}
-static int get_outline_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
+static void get_outline_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
{
int error;
glyph_hash_val_t* val;
@@ -1250,7 +1250,7 @@ static int get_outline_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
glyph_hash_val_t v;
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);
FT_Glyph_Get_CBox( info->glyph, FT_GLYPH_BBOX_PIXELS, &info->bbox);
@@ -1268,7 +1268,6 @@ static int get_outline_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;
}
/**
@@ -1279,9 +1278,8 @@ static int get_outline_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
* \param advance advance vector of the extracted glyph
* \return 0 on success
*/
-static int get_bitmap_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
+static void get_bitmap_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
{
- int error;
bitmap_hash_val_t* val;
bitmap_hash_key_t* key = &(info->hash_key);
@@ -1311,8 +1309,6 @@ static int get_bitmap_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
info->advance.y = val->advance.y;
} else
info->bm = info->bm_o = info->bm_s = 0;
-
- return 0;
}
/**
@@ -1767,12 +1763,8 @@ 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_outline_glyph(code, text_info.glyphs + text_info.length, &shift);
- error |= get_bitmap_glyph(code, text_info.glyphs + text_info.length, &shift);
-
- if (error) {
- continue;
- }
+ get_outline_glyph(code, text_info.glyphs + text_info.length, &shift);
+ get_bitmap_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;