Re: Outstanding patches, #57051

[Owen Taylor <otaylor redhat com>]

"Matthias Clasen" <matthiasc poet de> writes:

> Here is a new patch incorporating your proposals. Ok to commit ?

Go ahead,
                                        Owen
 
> Index: pango/pango-layout.c
> ===================================================================
> RCS file: /cvs/gnome/pango/pango/pango-layout.c,v
> retrieving revision 1.67
> diff -u -r1.67 pango-layout.c
> --- pango/pango-layout.c 2001/07/20 17:22:18 1.67
> +++ pango/pango-layout.c 2001/08/08 07:53:25
> @@ -3308,17 +3308,8 @@
>  
>  static void
>  pango_layout_line_get_empty_extents (PangoLayoutLine *line,
> -         PangoRectangle  *ink_rect,
>           PangoRectangle  *logical_rect)
>  {
> -  if (ink_rect)
> -    {
> -      ink_rect->x = 0;
> -      ink_rect->y = 0;
> -      ink_rect->width = 0;
> -      ink_rect->height = 0;
> -    }
> -  
>    if (logical_rect)
>      {
>        char *line_start;
> @@ -3486,12 +3477,6 @@
>    if (!LINE_IS_VALID (line))
>      return;
>  
> -  if (!line->runs)
> -    {
> -      pango_layout_line_get_empty_extents (line, ink_rect, logical_rect);
> -      return;
> -    }
> -  
>    if (ink_rect)
>      {
>        ink_rect->x = 0;
> @@ -3548,6 +3533,13 @@
>        
>       x_pos += run_logical.width;
>       tmp_list = tmp_list->next;
> +    }
> +  
> +  if (logical_rect && logical_rect->height == 0) 
> +    {
> +      PangoRectangle temp_rect;
> +      pango_layout_line_get_empty_extents (line, &temp_rect);
> +      logical_rect->height = temp_rect.height;
>      }
>  }