Changeset ae2674440d5319f10807c854f4c30876373c2f2b

Timestamp:

02/07/07 19:32:40 (1 year ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1183397560 +0000

git-parent:

[6e8a32cec984300f67e861dd0afb4fdfc4b46f8d]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1183397560 +0000

Message:

Freetype:
This patch:
* try to solve the fribidi styles problems that have occured
* introduces ft_style_t, to solve the precedent problem,
* solves a few errors from precedent commits,
* split some big functions on my request to avoid many imbrications.

Patch from Bernie Purcell.

Files:

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

modules/misc/freetype.c

@@ -94 +94 @@
-                                vlc_bool_t, vlc_bool_t, int * );
-#endif
-byte_t *
+int
-
-static int SetFontSize( filter_t *, int );
@@ -219 +219 @@
-};
-
+typedef struct
+{
+    int         i_font_size;
+    uint32_t    i_font_color; /* ARGB */
+    vlc_bool_t  b_italic;
+    vlc_bool_t  b_bold;
+    vlc_bool_t  b_underline;
+    char       *psz_fontname;
+} ft_style_t;
+
-static int Render( filter_t *, subpicture_region_t *, line_desc_t *, int, int);
-static void FreeLines( line_desc_t * );
@@ -324 +334 @@
-        goto error;
-    }
-
-    i_error = FT_New_Face( p_sys->p_library, psz_fontfile ? psz_fontfile : "",
-                           0, &p_sys->p_face );
@@ -995 +1004 @@
-    /* Calculate relative glyph positions and a bounding box for the
-     * entire string */
-(byte_t *)psz_string 
+strlen( psz_string )
-    {
-        msg_Err( p_filter, "out of memory" );
@@ -1019 +1028 @@
-        {
-            psz_line_start = psz_unicode;
-(byte_t *)psz_string 
+strlen( psz_string )
-            {
-                msg_Err( p_filter, "out of memory" );
@@ -1088 +1097 @@
-            p_line->pp_glyphs[ i ] = NULL;
-            FreeLine( p_line );
-(byte_t *)psz_string 
+strlen( psz_string )
-            if( p_prev ) p_prev->p_next = p_line;
-            else p_lines = p_line;
@@ -1151 +1160 @@
-
-#ifdef HAVE_FONTCONFIG
+static ft_style_t *CreateStyle( char *psz_fontname, int i_font_size,
+        int i_font_color, int i_font_alpha, vlc_bool_t b_bold,
+        vlc_bool_t b_italic, vlc_bool_t b_uline )
+{
+    ft_style_t  *p_style = malloc( sizeof( ft_style_t ));
+
+    if( p_style )
+    {
+        p_style->i_font_size  = i_font_size;
+        p_style->i_font_color = ( i_font_color & 0x00ffffff )
+                                | (( i_font_alpha & 0xff ) << 24 );
+        p_style->b_italic     = b_italic;
+        p_style->b_bold       = b_bold;
+        p_style->b_underline  = b_uline;
+        /* p_style has just been malloc'ed in this function -
+         * it CAN'T have a previous assignment, and hence we
+         * don't need to do a free() for any previous value -
+         * which will in fact be undefined. */
+        p_style->psz_fontname = strdup( psz_fontname );
+    }
+    return p_style;
+}
+
+static void DeleteStyle( ft_style_t *p_style )
+{
+    if( p_style )
+    {
+        if( p_style->psz_fontname )
+            free( p_style->psz_fontname );
+        free( p_style );
+    }
+}
+
+static vlc_bool_t StyleEquals( ft_style_t *s1, ft_style_t *s2 )
+{
+    if( !s1 || !s2 )
+        return VLC_FALSE;
+    if( s1 == s2 )
+        return VLC_TRUE;
+
+    if(( s1->i_font_size  == s2->i_font_size ) &&
+       ( s1->i_font_color == s2->i_font_color ) &&
+       ( s1->b_italic     == s2->b_italic ) &&
+       ( s1->b_bold       == s2->b_bold ) &&
+       ( s1->b_underline  == s2->b_underline ) &&
+       ( !strcmp( s1->psz_fontname, s2->psz_fontname )))
+    {
+        return VLC_TRUE;
+    }
+    return VLC_FALSE;
+}
+
-static int PushFont( font_stack_t **p_font, const char *psz_name, int i_size,
-                     int i_color, int i_alpha )
@@ -1160 +1221 @@
-
-    p_new = malloc( sizeof( font_stack_t ) );
-
+ 
-        return VLC_ENOMEM;
-
@@ -1239 +1300 @@
-}
-
-
+
+
-{
-    vlc_iconv_t iconv_handle = (vlc_iconv_t)(-1);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-#if defined(WORDS_BIGENDIAN)
-
+    
-#else
-
+    
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
- uint32_t *psz_unicode,
-int *pi_pen_x, int i_pen_y, int *pi_start
-
+
+uint32_t *psz_unicode, int *pi_pen_x, int i_pen_y
+int *pi_start, 
-{
-    FT_BBox      line;
-    int          i_yMin, i_yMax;
-    int          i;
+    vlc_bool_t   b_first_on_line = VLC_TRUE;
-
-    int          i_previous = 0;
@@ -1334 +1397 @@
-        FT_BBox glyph_size;
-
-
+
+
-
-        line.xMax = p_line->p_glyph_pos[ i ].x + glyph_size.xMax -
@@ -1344 +1408 @@
-    i_yMax = line.yMax;
-
-
+
+
+
+
-    {
-        FT_BBox glyph_size;
@@ -1365 +1432 @@
-        if( i_error )
-        {
-
+
+
-            p_line->pp_glyphs[ i ] = NULL;
-            return VLC_EGENERIC;
@@ -1372 +1440 @@
-        if( i_error )
-        {
-
+
+
-            p_line->pp_glyphs[ i ] = NULL;
-            return VLC_EGENERIC;
@@ -1385 +1454 @@
-        if( b_uline )
-        {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-        p_line->pp_glyphs[ i ] = (FT_BitmapGlyph)tmp_glyph;
@@ -1395 +1468 @@
-
-        line.xMax = p_line->p_glyph_pos[i].x + glyph_size.xMax -
-
+        
-        if( line.xMax > (int)p_filter->fmt_out.video.i_visible_width - 20 )
-        {
@@ -1409 +1482 @@
-            if( psz_unicode == psz_unicode_start )
-            {
-
+
+
+
+
+
+
+
+
+
+
+
-                p_line->pp_glyphs[ i ] = NULL;
-
+
+
+
+
+
+
+
-            }
-            else
-            {
-0xffff
+'\n'
-            }
-            psz_unicode = psz_unicode_start;
@@ -1434 +1523 @@
-    }
-    p_line->i_width = line.xMax;
-
+
+
-    p_line->pp_glyphs[ i ] = NULL;
-
-    p_result->x = __MAX( p_result->x, line.xMax );
-
+
+
-
-    *pi_start = i;
@@ -1460 +1551 @@
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    vlc_bool_t b_italic = VLC_FALSE;
-    vlc_bool_t b_bold   = VLC_FALSE;
-    vlc_bool_t b_uline  = VLC_FALSE;
-
-    line_desc_t *p_line = NULL;
-    line_desc_t *p_prev = NULL;
-
-    char *psz_node  = NULL;
-
-    int i_pen_x = 0;
-    int i_pen_y = 0;
-    int i_posn  = 0;
-
-    int rv = VLC_SUCCESS;
-
-    p_result->x = p_result->y = 0;
-    tmp_result.x = tmp_result.y = 0;
-
-    if( p_font_style )
-    {
-
-
-
-
-
+rv = 
+     
+     
+     
+     
-
-        if( p_font_style->i_style_flags & STYLE_BOLD )
@@ -1502 +1716 @@
-    else
-    {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    {
-        switch ( xml_ReaderNodeType( p_xml_reader ) )
@@ -1533 +1753 @@
-                {
-                    if( !strcasecmp( "font", psz_node ) )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                    else if( !strcasecmp( "b", psz_node ) )
-                    {
-                        b_bold = VLC_TRUE;
-                    }
-                    else if( !strcasecmp( "i", psz_node ) )
-                    {
-                        b_italic = VLC_TRUE;
-                    }
-                    else if( !strcasecmp( "u", psz_node ) )
-                    {
-                        b_uline = VLC_TRUE;
-                    }
-                    else if( !strcasecmp( "br", psz_node ) )
-                    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                    }
+
-                    free( psz_node );
-                }
@@ -1626 +1778 @@
-                if( psz_node )
-                {
-
-
-
-
-
-
-
+
+
+
-                    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                    free( psz_node );
-                }
-                break;
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+