diff options
| author | Grigori Goronzy <greg@blackbox> | 2010-07-14 15:17:34 +0200 |
|---|---|---|
| committer | Grigori Goronzy <greg@blackbox> | 2010-07-14 15:17:34 +0200 |
| commit | 476692862efa1ad0def49125e670d59a9095fd36 (patch) | |
| tree | ef37abf735eb6cdb07351375e29adcbc175ddf33 | |
| parent | 0c547546e7a447e00a8e4dde974724b7ecc298a7 (diff) | |
| download | libass-476692862efa1ad0def49125e670d59a9095fd36.tar.bz2 libass-476692862efa1ad0def49125e670d59a9095fd36.tar.xz | |
Avoid unnecessary conditional and initializations
| -rw-r--r-- | libass/ass_render.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c index 4e269d4..75d5e7a 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -1040,8 +1040,7 @@ get_outline_glyph(ASS_Renderer *render_priv, int symbol, GlyphInfo *info, val = cache_find_glyph(render_priv->cache.glyph_cache, &key); if (val) { info->glyph = val->glyph; - if (val->outline_glyph) - info->outline_glyph = val->outline_glyph; + info->outline_glyph = val->outline_glyph; info->bbox = val->bbox_scaled; info->advance.x = val->advance.x; info->advance.y = val->advance.y; @@ -1136,8 +1135,8 @@ get_bitmap_glyph(ASS_Renderer *render_priv, GlyphInfo *info) info->bm = info->bm_o = info->bm_s = 0; if (info->glyph && info->symbol != '\n' && info->symbol != 0 && !info->skip) { - FT_Glyph glyph = info->glyph; - FT_Glyph outline = info->outline_glyph; + FT_Glyph glyph; + FT_Glyph outline; FT_Glyph_Copy(info->glyph, &glyph); FT_Glyph_Copy(info->outline_glyph, &outline); // calculating rotation shift vector (from rotation origin to the glyph basepoint) |