diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pango-layout.c | 6 |
8 files changed, 43 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Wed Dec 19 22:40:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_line_extents_layout_coords): + Remove incorrect special casing of initial line. + (Reported by Darin Adler) + Tue Dec 18 12:33:03 2001 Owen Taylor <otaylor@redhat.com> * modules/indic/*-x.c (pango_engine_shape): Syllable diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index bad62bd8..656c8fb3 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +Wed Dec 19 22:40:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_line_extents_layout_coords): + Remove incorrect special casing of initial line. + (Reported by Darin Adler) + Tue Dec 18 12:33:03 2001 Owen Taylor <otaylor@redhat.com> * modules/indic/*-x.c (pango_engine_shape): Syllable diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index bad62bd8..656c8fb3 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Wed Dec 19 22:40:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_line_extents_layout_coords): + Remove incorrect special casing of initial line. + (Reported by Darin Adler) + Tue Dec 18 12:33:03 2001 Owen Taylor <otaylor@redhat.com> * modules/indic/*-x.c (pango_engine_shape): Syllable diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index bad62bd8..656c8fb3 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +Wed Dec 19 22:40:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_line_extents_layout_coords): + Remove incorrect special casing of initial line. + (Reported by Darin Adler) + Tue Dec 18 12:33:03 2001 Owen Taylor <otaylor@redhat.com> * modules/indic/*-x.c (pango_engine_shape): Syllable diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index bad62bd8..656c8fb3 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Wed Dec 19 22:40:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_line_extents_layout_coords): + Remove incorrect special casing of initial line. + (Reported by Darin Adler) + Tue Dec 18 12:33:03 2001 Owen Taylor <otaylor@redhat.com> * modules/indic/*-x.c (pango_engine_shape): Syllable diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index bad62bd8..656c8fb3 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Wed Dec 19 22:40:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_line_extents_layout_coords): + Remove incorrect special casing of initial line. + (Reported by Darin Adler) + Tue Dec 18 12:33:03 2001 Owen Taylor <otaylor@redhat.com> * modules/indic/*-x.c (pango_engine_shape): Syllable diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index bad62bd8..656c8fb3 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Wed Dec 19 22:40:24 2001 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (get_line_extents_layout_coords): + Remove incorrect special casing of initial line. + (Reported by Darin Adler) + Tue Dec 18 12:33:03 2001 Owen Taylor <otaylor@redhat.com> * modules/indic/*-x.c (pango_engine_shape): Syllable diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 148909b3..76a1a085 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -1842,11 +1842,7 @@ get_line_extents_layout_coords (PangoLayout *layout, { *line_ink_layout = line_ink; line_ink_layout->x = line_ink.x + x_offset; - - if (line == layout->lines->data) - line_ink_layout->y = line_ink.y; - else - line_ink_layout->y = y_offset - line_logical.y + line_ink.y; + line_ink_layout->y = y_offset - line_logical.y + line_ink.y; } if (line_logical_layout) |