vlc | branch: master | Salah-Eddin Shaban <[email protected]> | Tue May 12 09:16:04 2015 +0300| [3bd4f0e323b503bbb20b452c84c2572e63346c68] | committer: Jean-Baptiste Kempf
freetype: remove compiler warnings Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3bd4f0e323b503bbb20b452c84c2572e63346c68 --- modules/text_renderer/text_layout.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/text_renderer/text_layout.c b/modules/text_renderer/text_layout.c index 18a195e..84e1807 100644 --- a/modules/text_renderer/text_layout.c +++ b/modules/text_renderer/text_layout.c @@ -126,7 +126,7 @@ typedef struct paragraph_t } paragraph_t; -void FreeLine( line_desc_t *p_line ) +static void FreeLine( line_desc_t *p_line ) { for( int i = 0; i < p_line->i_character_count; i++ ) { @@ -1038,10 +1038,10 @@ static int LayoutLine( filter_t *p_filter, bool b_karaoke = p_paragraph->pi_karaoke_bar[ i_paragraph_index ] != 0; p_ch->i_color = b_karaoke ? - p_paragraph->pp_styles[ i_paragraph_index ]->i_karaoke_background_color - | p_paragraph->pp_styles[ i_paragraph_index ]->i_karaoke_background_alpha << 24 - : p_paragraph->pp_styles[ i_paragraph_index ]->i_font_color - | p_paragraph->pp_styles[ i_paragraph_index ]->i_font_alpha << 24; + ( uint32_t ) p_glyph_style->i_karaoke_background_color + | p_glyph_style->i_karaoke_background_alpha << 24 + : ( uint32_t ) p_glyph_style->i_font_color + | p_glyph_style->i_font_alpha << 24; p_ch->i_line_thickness = i_line_thickness; p_ch->i_line_offset = i_line_offset; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
