vlc/vlc-3.0 | branch: master | Alexandre Janniaux <[email protected]> | Fri May 1 12:29:33 2020 +0200| [74559877bb62266eae52bed1fb0410c7297533db] | committer: Francois Cartegnie
freetype: use labs for FT_Fixed values FT_Fixed is defined as a signed long and most operation in freetype are historically using FT_Long. Fix a truncation warning. (cherry picked from commit d761abd891a4c4caa35d3f53dce8250127954c4d) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=74559877bb62266eae52bed1fb0410c7297533db --- modules/text_renderer/freetype/text_layout.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c index ca9ccb83bc..4dce1e30ba 100644 --- a/modules/text_renderer/freetype/text_layout.c +++ b/modules/text_renderer/freetype/text_layout.c @@ -1232,12 +1232,12 @@ static int LayoutLine( filter_t *p_filter, if( p_ch->p_style->i_style_flags & (STYLE_UNDERLINE | STYLE_STRIKEOUT) ) { i_line_offset = - abs( FT_FLOOR( FT_MulFix( p_face->underline_position, - p_face->size->metrics.y_scale ) ) ); + labs( FT_FLOOR( FT_MulFix( p_face->underline_position, + p_face->size->metrics.y_scale ) ) ); i_line_thickness = - abs( FT_CEIL( FT_MulFix( p_face->underline_thickness, - p_face->size->metrics.y_scale ) ) ); + labs( FT_CEIL( FT_MulFix( p_face->underline_thickness, + p_face->size->metrics.y_scale ) ) ); if( p_ch->p_style->i_style_flags & STYLE_STRIKEOUT ) { @@ -1245,8 +1245,8 @@ static int LayoutLine( filter_t *p_filter, * underline. That means that strikethrough takes precedence */ i_line_offset -= - abs( FT_FLOOR( FT_MulFix( p_face->descender * 2, - p_face->size->metrics.y_scale ) ) ); + labs( FT_FLOOR( FT_MulFix( p_face->descender * 2, + p_face->size->metrics.y_scale ) ) ); p_bitmaps->glyph_bbox.yMax = __MAX( p_bitmaps->glyph_bbox.yMax, - i_line_offset ); @@ -1291,7 +1291,7 @@ static int LayoutLine( filter_t *p_filter, /* Get max advance for grid mode */ if( b_grid && i_font_max_advance_y == 0 && p_face ) { - i_font_max_advance_y = abs( FT_FLOOR( FT_MulFix( p_face->max_advance_height, + i_font_max_advance_y = labs( FT_FLOOR( FT_MulFix( p_face->max_advance_height, p_face->size->metrics.y_scale ) ) ); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
