Changeset 171ad3314ef99d1d88ee1a31af8d79149d621118

Show
Ignore:
Timestamp:
30/03/07 15:29:15 (2 years ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1175261355 +0000
git-parent:

[db7b0a56aa13250845c4721f3cabb72d975128d6]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1175261355 +0000
Message:

* Missing part of previous commit [19535].

cleanup of freetype.c by Bernie Purcell

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/misc/freetype.c

    rdb7b0a5 r171ad33  
    123123 
    124124static int   pi_sizes[] = { 20, 18, 16, 12, 6 }; 
    125 static char *ppsz_sizes_text[] = { N_("Smaller"), N_("Small"), N_("Normal"), 
    126                                    N_("Large"), N_("Larger") }; 
     125static const char *ppsz_sizes_text[] = { N_("Smaller"), N_("Small"), N_("Normal"), 
     126                                         N_("Large"), N_("Larger") }; 
    127127#define YUVP_TEXT N_("Use YUVP renderer") 
    128128#define YUVP_LONGTEXT N_("This renders the font using \"paletized YUV\". " \ 
    …… 
    137137 
    138138static int   pi_effects[] = { 1, 2, 3 }; 
    139 static char *ppsz_effects_text[] = { N_("Background"),N_("Outline"), 
    140                                      N_("Fat Outline") }; 
     139static const char *ppsz_effects_text[] = { N_("Background"),N_("Outline"), 
     140                                           N_("Fat Outline") }; 
    141141static int pi_color_values[] = { 
    142142  0x00000000, 0x00808080, 0x00C0C0C0, 0x00FFFFFF, 0x00800000, 
    …… 
    144144  0x0000FF00, 0x00800080, 0x00000080, 0x000000FF, 0x0000FFFF }; 
    145145 
    146 static char *ppsz_color_descriptions[] = { 
     146static const char *ppsz_color_descriptions[] = { 
    147147  N_("Black"), N_("Gray"), N_("Silver"), N_("White"), N_("Maroon"), 
    148148  N_("Red"), N_("Fuchsia"), N_("Yellow"), N_("Olive"), N_("Green"), N_("Teal"), 
    …… 
    299299        GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 ); 
    300300        strcat( psz_fontfile, "\\fonts\\arial.ttf" ); 
    301 #elif __APPLE__ 
     301#elif defined(__APPLE__) 
    302302        strcpy( psz_fontfile, DEFAULT_FONT ); 
    303303#else 
    …… 
    11411141 
    11421142#ifdef HAVE_FONTCONFIG 
    1143 static int PushFont( font_stack_t **p_font, char *psz_name, int i_size, 
     1143static int PushFont( font_stack_t **p_font, const char *psz_name, int i_size, 
    11441144                     int i_color, int i_alpha ) 
    11451145{ 
    …… 
    13151315        FT_BBox glyph_size; 
    13161316 
    1317         FT_Glyph_Get_CBox( p_line->pp_glyphs[ i ], ft_glyph_bbox_pixels, &glyph_size ); 
     1317        FT_Glyph_Get_CBox( (FT_Glyph) p_line->pp_glyphs[ i ], ft_glyph_bbox_pixels, &glyph_size ); 
    13181318 
    13191319        line.xMax = p_line->p_glyph_pos[ i ].x + glyph_size.xMax - 
    …… 
    14831483    else 
    14841484    { 
    1485         PushFont( &p_fonts, FC_DEFAULT_FONT, 24, 0xffffff, 0 ); 
     1485        PushFont( &p_fonts, FC_DEFAULT_FONT, p_sys->i_font_size, 0xffffff, 0 ); 
    14861486    } 
    14871487 
    …… 
    17321732 
    17331733    p_sub = stream_MemoryNew( VLC_OBJECT(p_filter), 
    1734                               p_region_in->psz_html, 
     1734                              (uint8_t *) p_region_in->psz_html, 
    17351735                              strlen( p_region_in->psz_html ), 
    17361736                              VLC_TRUE );