Commit 65c4b00e authored by Salah-Eddin Shaban's avatar Salah-Eddin Shaban Committed by Jean-Baptiste Kempf

freetype: rename NewLayoutLine()

It should be LayoutLine(). To be consistent with LayoutParagraph() and LayoutText().
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 776b2588
...@@ -862,10 +862,10 @@ static int LoadGlyphs( filter_t *p_filter, paragraph_t *p_paragraph, ...@@ -862,10 +862,10 @@ static int LoadGlyphs( filter_t *p_filter, paragraph_t *p_paragraph,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
static int NewLayoutLine( filter_t *p_filter, static int LayoutLine( filter_t *p_filter,
paragraph_t *p_paragraph, paragraph_t *p_paragraph,
int i_start_offset, int i_end_offset, int i_start_offset, int i_end_offset,
line_desc_t **pp_line ) line_desc_t **pp_line )
{ {
if( p_paragraph->i_size <= 0 || p_paragraph->i_runs_count <= 0 if( p_paragraph->i_size <= 0 || p_paragraph->i_runs_count <= 0
|| i_start_offset >= i_end_offset || i_start_offset >= i_end_offset
...@@ -873,7 +873,7 @@ static int NewLayoutLine( filter_t *p_filter, ...@@ -873,7 +873,7 @@ static int NewLayoutLine( filter_t *p_filter,
|| i_end_offset <= 0 || i_end_offset > p_paragraph->i_size ) || i_end_offset <= 0 || i_end_offset > p_paragraph->i_size )
{ {
msg_Err( p_filter, msg_Err( p_filter,
"NewLayoutLine() invalid parameters. " "LayoutLine() invalid parameters. "
"Paragraph size: %d. Runs count: %d. " "Paragraph size: %d. Runs count: %d. "
"Start offset: %d. End offset: %d", "Start offset: %d. End offset: %d",
p_paragraph->i_size, p_paragraph->i_runs_count, p_paragraph->i_size, p_paragraph->i_runs_count,
...@@ -1104,8 +1104,8 @@ static int LayoutParagraph( filter_t *p_filter, paragraph_t *p_paragraph, ...@@ -1104,8 +1104,8 @@ static int LayoutParagraph( filter_t *p_filter, paragraph_t *p_paragraph,
if( i == p_paragraph->i_size ) if( i == p_paragraph->i_size )
{ {
if( i_line_start < i ) if( i_line_start < i )
if( NewLayoutLine( p_filter, p_paragraph, if( LayoutLine( p_filter, p_paragraph,
i_line_start, i, pp_line ) ) i_line_start, i, pp_line ) )
goto error; goto error;
break; break;
...@@ -1160,8 +1160,8 @@ static int LayoutParagraph( filter_t *p_filter, paragraph_t *p_paragraph, ...@@ -1160,8 +1160,8 @@ static int LayoutParagraph( filter_t *p_filter, paragraph_t *p_paragraph,
else else
i_end_offset = i; i_end_offset = i;
if( NewLayoutLine( p_filter, p_paragraph, i_line_start, if( LayoutLine( p_filter, p_paragraph, i_line_start,
i_end_offset, pp_line ) ) i_end_offset, pp_line ) )
goto error; goto error;
pp_line = &( *pp_line )->p_next; pp_line = &( *pp_line )->p_next;
......
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