[MPlayer-cvslog] r33403 - trunk/libmenu/menu.c

[Clément Bœsch]

On Sat, May 07, 2011 at 09:06:27PM +0200, reimar wrote:
> Author: reimar
> Date: Sat May  7 21:06:26 2011
> New Revision: 33403
> 
> Log:
> Fix variable type and values to match function prototype.
> 
> Modified:
>    trunk/libmenu/menu.c
> 
> Modified: trunk/libmenu/menu.c
> ==============================================================================
> --- trunk/libmenu/menu.c	Sat May  7 20:59:15 2011	(r33402)
> +++ trunk/libmenu/menu.c	Sat May  7 21:06:26 2011	(r33403)
> @@ -438,7 +438,7 @@ static char *menu_fribidi(char *txt)
>    static size_t buffer_size = 1024;
>    static char *outputstr;
>  
> -  FriBidiCharType base;
> +  FriBidiParType base;
>    fribidi_boolean log2vis;
>    size_t len;
>  
> @@ -459,7 +459,7 @@ static char *menu_fribidi(char *txt)
>        outputstr = realloc(outputstr, buffer_size);
>      }
>      len = fribidi_charset_to_unicode (char_set_num, txt, len, logical);
> -    base = menu_fribidi_flip_commas?FRIBIDI_TYPE_ON:FRIBIDI_TYPE_L;
> +    base = menu_fribidi_flip_commas?FRIBIDI_PAR_ON:FRIBIDI_PAR_LTR;
>      log2vis = fribidi_log2vis (logical, len, &base, visual, NULL, NULL, NULL);
>      if (log2vis) {
>        len = fribidi_remove_bidi_marks (visual, len, NULL, NULL, NULL);

Careful about that one. IIRC we got the same issue with a sub file. It
may be meaningful to check for the version of FriBiDi.

-- 
Clément B.