Skip to content

V
vlc-1.1
Commit 165cd46a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Freetype: whitespace cleanup

parent cf60f4b8
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
modules/misc/freetype.c
View file @ 165cd46a
/***************************************************************************** /*****************************************************************************
* freetype.c : Put text on the video, using freetype2 * freetype.c : Put text on the video, using freetype2
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 - 2007 the VideoLAN team * Copyright (C) 2002 - 2011 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Sigmund Augdal Helberg <dnumgis@videolan.org> * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
...@@ -1252,13 +1252,13 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -1252,13 +1252,13 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_DEFAULT ); i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_DEFAULT );
if( i_error ) if( i_error )
{ {
i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_DEFAULT ); i_error = FT_Load_Glyph( face, i_glyph_index, FT_LOAD_DEFAULT );
if( i_error ) if( i_error )
{ {
msg_Err( p_filter, "unable to render text FT_Load_Glyph returned" msg_Err( p_filter, "unable to render text FT_Load_Glyph returned"
" %d", i_error ); " %d", i_error );
goto error; goto error;
} }
} }
i_error = FT_Get_Glyph( glyph, &tmp_glyph ); i_error = FT_Get_Glyph( glyph, &tmp_glyph );
if( i_error ) if( i_error )
...@@ -1542,14 +1542,14 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, ...@@ -1542,14 +1542,14 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_DEFAULT ); i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_NO_BITMAP | FT_LOAD_DEFAULT );
if( i_error ) if( i_error )
{ {
i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_DEFAULT ); i_error = FT_Load_Glyph( p_face, i_glyph_index, FT_LOAD_DEFAULT );
if( i_error ) if( i_error )
{ {
msg_Err( p_filter, msg_Err( p_filter,
"unable to render text FT_Load_Glyph returned %d", i_error ); "unable to render text FT_Load_Glyph returned %d", i_error );
p_line->pp_glyphs[ i ] = NULL; p_line->pp_glyphs[ i ] = NULL;
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
/* Do synthetic styling now that Freetype supports it; /* Do synthetic styling now that Freetype supports it;
......
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