vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun May 3 18:08:51 2015 +0200| [a9c0a1ba8a291b5370208dddc373c3cee2dcb265] | committer: Jean-Baptiste Kempf
Freetype: code cosmetic Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a9c0a1ba8a291b5370208dddc373c3cee2dcb265 --- modules/text_renderer/freetype.c | 10 ++++++---- modules/text_renderer/text_layout.h | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c index a711b5f..0c97b23 100644 --- a/modules/text_renderer/freetype.c +++ b/modules/text_renderer/freetype.c @@ -815,7 +815,7 @@ static inline int RenderAXYZ( filter_t *p_filter, for( int i = 0; i < p_line->i_character_count; i++ ) { const line_character_t *ch = &p_line->p_character[i]; - FT_BitmapGlyph p_glyph = g == 0 ? ch->p_shadow : g == 1 ? ch->p_outline : ch->p_glyph; + const FT_BitmapGlyph p_glyph = g == 0 ? ch->p_shadow : g == 1 ? ch->p_outline : ch->p_glyph; if( !p_glyph ) continue; @@ -1087,9 +1087,11 @@ static int RenderCommon( filter_t *p_filter, subpicture_region_t *p_region_out, FillRGBAPicture, BlendRGBAPixel ); else if( *p_chroma == VLC_CODEC_ARGB ) - rv = RenderAXYZ( p_filter, p_region_out, p_lines, &bbox, - i_margin, *p_chroma, RGBFromRGB, - FillARGBPicture, BlendARGBPixel ); + rv = RenderAXYZ( p_filter, p_region_out, p_lines, &bbox, i_margin, + VLC_CODEC_ARGB, + RGBFromRGB, + FillARGBPicture, + BlendARGBPixel ); if( !rv ) break; diff --git a/modules/text_renderer/text_layout.h b/modules/text_renderer/text_layout.h index 0b645c2..e5b60b9 100644 --- a/modules/text_renderer/text_layout.h +++ b/modules/text_renderer/text_layout.h @@ -53,6 +53,5 @@ line_desc_t *NewLine( int i_count ); int LayoutText( filter_t *p_filter, line_desc_t **pp_lines, FT_BBox *p_bbox, int *pi_max_face_height, - uni_char_t *psz_text, text_style_t **pp_styles, uint32_t *pi_k_dates, int i_len ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
