vlc | branch: master | Salah-Eddin Shaban <[email protected]> | Tue May 12 09:16:02 2015 +0300| [65c4b00e1b4b3915ceedd143d1dee944aa8dbab2] | committer: Jean-Baptiste Kempf
freetype: rename NewLayoutLine() It should be LayoutLine(). To be consistent with LayoutParagraph() and LayoutText(). Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=65c4b00e1b4b3915ceedd143d1dee944aa8dbab2 --- modules/text_renderer/text_layout.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/text_renderer/text_layout.c b/modules/text_renderer/text_layout.c index ae8e318..28e120c 100644 --- a/modules/text_renderer/text_layout.c +++ b/modules/text_renderer/text_layout.c @@ -862,10 +862,10 @@ static int LoadGlyphs( filter_t *p_filter, paragraph_t *p_paragraph, return VLC_SUCCESS; } -static int NewLayoutLine( filter_t *p_filter, - paragraph_t *p_paragraph, - int i_start_offset, int i_end_offset, - line_desc_t **pp_line ) +static int LayoutLine( filter_t *p_filter, + paragraph_t *p_paragraph, + int i_start_offset, int i_end_offset, + line_desc_t **pp_line ) { if( p_paragraph->i_size <= 0 || p_paragraph->i_runs_count <= 0 || i_start_offset >= i_end_offset @@ -873,7 +873,7 @@ static int NewLayoutLine( filter_t *p_filter, || i_end_offset <= 0 || i_end_offset > p_paragraph->i_size ) { msg_Err( p_filter, - "NewLayoutLine() invalid parameters. " + "LayoutLine() invalid parameters. " "Paragraph size: %d. Runs count: %d. " "Start offset: %d. End offset: %d", p_paragraph->i_size, p_paragraph->i_runs_count, @@ -1104,8 +1104,8 @@ static int LayoutParagraph( filter_t *p_filter, paragraph_t *p_paragraph, if( i == p_paragraph->i_size ) { if( i_line_start < i ) - if( NewLayoutLine( p_filter, p_paragraph, - i_line_start, i, pp_line ) ) + if( LayoutLine( p_filter, p_paragraph, + i_line_start, i, pp_line ) ) goto error; break; @@ -1160,8 +1160,8 @@ static int LayoutParagraph( filter_t *p_filter, paragraph_t *p_paragraph, else i_end_offset = i; - if( NewLayoutLine( p_filter, p_paragraph, i_line_start, - i_end_offset, pp_line ) ) + if( LayoutLine( p_filter, p_paragraph, i_line_start, + i_end_offset, pp_line ) ) goto error; pp_line = &( *pp_line )->p_next; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
