[vlc-devel] [PATCH] freetype: use labs for FT_Fixed values

[Jean-Baptiste Kempf]

OK

On Fri, May 1, 2020, at 12:40, Alexandre Janniaux wrote:
> FT_Fixed is defined as a signed long and most operation in freetype are
> historically using FT_Long. Fix a truncation warning.
> ---
>  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 d59aa0d1ec9..6dc3854cd6e 100644
> --- a/modules/text_renderer/freetype/text_layout.c
> +++ b/modules/text_renderer/freetype/text_layout.c
> @@ -1294,12 +1294,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 )
>              {
> @@ -1307,8 +1307,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 );
> @@ -1352,7 +1352,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 ) 
> ) );
>          }
>  
> -- 
> 2.26.2
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel

-- 
Jean-Baptiste Kempf -  President
+33 672 704 734