Changeset 5efb1f0118bdd2bc7f1836476b02b52dda468c6c

Timestamp:

11/08/07 07:57:28 (1 year ago)

Author:

Bernie Purcell <bitmap@videolan.org>

git-committer:

Bernie Purcell <bitmap@videolan.org> 1186811848 +0000

git-parent:

[7b246662a8b51c5e10676b4010865cdc26fa163e]

git-author:

Bernie Purcell <bitmap@videolan.org> 1186811848 +0000

Message:

Prescaled output support

Files:

• modules/misc/freetype.c (modified) (12 diffs)

modules/misc/freetype.c

@@ -965 +965 @@
-    vlc_iconv_t iconv_handle = (vlc_iconv_t)(-1);
-    int i_font_color, i_font_alpha, i_font_size, i_red, i_green, i_blue;
+    vlc_value_t val;
+    int i_scale = 1000;
-
-    FT_BBox line;
@@ -976 +978 @@
-    if( !psz_string || !*psz_string ) return VLC_EGENERIC;
-
+    if( VLC_SUCCESS == var_Get( p_filter, "scale", &val ))
+        i_scale = val.i_int;
+ 
-    if( p_region_in->p_style )
-    {
-        i_font_color = __MAX( __MIN( p_region_in->p_style->i_font_color, 0xFFFFFF ), 0 );
-        i_font_alpha = __MAX( __MIN( p_region_in->p_style->i_font_alpha, 255 ), 0 );
-
+ * i_scale / 1000
-    }
-    else
@@ -986 +991 @@
-        i_font_color = p_sys->i_font_color;
-        i_font_alpha = 255 - p_sys->i_font_opacity;
-
+ * i_scale / 1000
-    }
-
@@ -1634 +1639 @@
-
-static int HandleFontAttributes( xml_reader_t *p_xml_reader,
-
+, int i_scale
-{
-    int        rv;
@@ -1653 +1658 @@
-    {
-        psz_fontname = strdup( psz_fontname );
+        i_font_size = i_font_size * 1000 / i_scale;
-    }
-    i_font_alpha = (i_font_color >> 24) & 0xff;
@@ -1703 +1709 @@
-    rv = PushFont( p_fonts,
-                   psz_fontname,
-
+ * i_scale / 1000
-                   (i_font_color & 0xffffff) | ((i_font_alpha & 0xff) << 24),
-                   i_karaoke_bg_color );
@@ -1865 +1871 @@
-    uint32_t     *psz_text_orig  = psz_text;
-    font_stack_t *p_fonts        = NULL;
+    vlc_value_t   val;
+    int           i_scale        = 1000;
-
-    char *psz_node  = NULL;
@@ -1872 +1880 @@
-    vlc_bool_t b_uline  = VLC_FALSE;
-
+    if( VLC_SUCCESS == var_Get( p_filter, "scale", &val ))
+        i_scale = val.i_int;
+ 
-    if( p_font_style )
-    {
-        rv = PushFont( &p_fonts,
-               p_font_style->psz_fontname,
-
+ * i_scale / 1000
-               (p_font_style->i_font_color & 0xffffff) |
-                   ((p_font_style->i_font_alpha & 0xff) << 24),
@@ -1893 +1904 @@
-        rv = PushFont( &p_fonts,
-                       FC_DEFAULT_FONT,
-
+ * i_scale / 1000
-                       0x00ffffff,
-                       0x00ffffff );
@@ -1928 +1939 @@
-                {
-                    if( !strcasecmp( "font", psz_node ) )
-
+, i_scale
-                    else if( !strcasecmp( "b", psz_node ) )
-                        b_bold = VLC_TRUE;
@@ -2737 +2748 @@
-        if( p_sys->i_default_font_size )
-        {
-
+
+
+
+
-        }
-        else
@@ -2749 +2763 @@
-        {
-            msg_Warn( p_filter, "invalid fontsize, using 12" );
-
+
+
+
+
-        }
-