Skip to content

V
vlc-2-2
Commit 648b99e9 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Renamed Render into RenderYUVP (freetype).

parent 63e66b36
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/misc/text_renderer/freetype.c
View file @ 648b99e9
...@@ -259,7 +259,7 @@ typedef struct ...@@ -259,7 +259,7 @@ typedef struct
char *psz_fontname; char *psz_fontname;
} ft_style_t; } ft_style_t;
static int Render( filter_t *, subpicture_region_t *, line_desc_t *, int, int); static int RenderYUVP( filter_t *, subpicture_region_t *, line_desc_t *, int, int);
static void FreeLines( line_desc_t * ); static void FreeLines( line_desc_t * );
static void FreeLine( line_desc_t * ); static void FreeLine( line_desc_t * );
...@@ -525,11 +525,11 @@ static int LoadFontsFromAttachments( filter_t *p_filter ) ...@@ -525,11 +525,11 @@ static int LoadFontsFromAttachments( filter_t *p_filter )
} }
/***************************************************************************** /*****************************************************************************
* Render: place string in picture * RenderYUVP: place string in picture
***************************************************************************** *****************************************************************************
* This function merges the previously rendered freetype glyphs into a picture * This function merges the previously rendered freetype glyphs into a picture
*****************************************************************************/ *****************************************************************************/
static int Render( filter_t *p_filter, subpicture_region_t *p_region, static int RenderYUVP( filter_t *p_filter, subpicture_region_t *p_region,
line_desc_t *p_line, int i_width, int i_height ) line_desc_t *p_line, int i_width, int i_height )
{ {
VLC_UNUSED(p_filter); VLC_UNUSED(p_filter);
...@@ -795,7 +795,7 @@ static void DrawBlack( line_desc_t *p_line, int i_width, subpicture_region_t *p_ ...@@ -795,7 +795,7 @@ static void DrawBlack( line_desc_t *p_line, int i_width, subpicture_region_t *p_
} }
/***************************************************************************** /*****************************************************************************
* Render: place string in picture * RenderYUVA: place string in picture
***************************************************************************** *****************************************************************************
* This function merges the previously rendered freetype glyphs into a picture * This function merges the previously rendered freetype glyphs into a picture
*****************************************************************************/ *****************************************************************************/
...@@ -1251,7 +1251,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -1251,7 +1251,7 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
p_region_out->i_y = p_region_in->i_y; p_region_out->i_y = p_region_in->i_y;
if( var_InheritBool( p_filter, "freetype-yuvp" ) ) if( var_InheritBool( p_filter, "freetype-yuvp" ) )
Render( p_filter, p_region_out, p_lines, result.x, result.y ); RenderYUVP( p_filter, p_region_out, p_lines, result.x, result.y );
else else
RenderYUVA( p_filter, p_region_out, p_lines, result.x, result.y ); RenderYUVA( p_filter, p_region_out, p_lines, result.x, result.y );
...@@ -2218,7 +2218,7 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -2218,7 +2218,7 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
if(( rv == VLC_SUCCESS ) && ( i_len > 0 )) if(( rv == VLC_SUCCESS ) && ( i_len > 0 ))
{ {
if( var_InheritBool( p_filter, "freetype-yuvp" ) ) if( var_InheritBool( p_filter, "freetype-yuvp" ) )
Render( p_filter, p_region_out, p_lines, RenderYUVP( p_filter, p_region_out, p_lines,
result.x, result.y ); result.x, result.y );
else else
RenderYUVA( p_filter, p_region_out, p_lines, RenderYUVA( p_filter, p_region_out, p_lines,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment