summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-02-15 20:46:49 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-02-15 20:46:49 +0000
commit6c11912ab8c1797bcf0209a6e47a86653f561ecf (patch)
tree8281124f4f286a3168b924451d7f10402cf6254b
parent0bca108a0ab7e081dc57640af3fbf9870749e7b8 (diff)
downloadpango-6c11912ab8c1797bcf0209a6e47a86653f561ecf.tar.gz
fix another "count line lengths to get line start" bug
2001-02-13 Havoc Pennington <hp@redhat.com> * pango/pango-layout.c (pango_layout_line_get_x_ranges): fix another "count line lengths to get line start" bug
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-05
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-25
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/pango-layout.c9
8 files changed, 37 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 6bbd3985..34091356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-13 Havoc Pennington <hp@redhat.com>
+
+ * pango/pango-layout.c (pango_layout_line_get_x_ranges): fix
+ another "count line lengths to get line start" bug
+
2001-02-12 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_list_insert_internal):
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 6bbd3985..34091356 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+2001-02-13 Havoc Pennington <hp@redhat.com>
+
+ * pango/pango-layout.c (pango_layout_line_get_x_ranges): fix
+ another "count line lengths to get line start" bug
+
2001-02-12 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_list_insert_internal):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 6bbd3985..34091356 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2001-02-13 Havoc Pennington <hp@redhat.com>
+
+ * pango/pango-layout.c (pango_layout_line_get_x_ranges): fix
+ another "count line lengths to get line start" bug
+
2001-02-12 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_list_insert_internal):
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 6bbd3985..34091356 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+2001-02-13 Havoc Pennington <hp@redhat.com>
+
+ * pango/pango-layout.c (pango_layout_line_get_x_ranges): fix
+ another "count line lengths to get line start" bug
+
2001-02-12 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_list_insert_internal):
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 6bbd3985..34091356 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+2001-02-13 Havoc Pennington <hp@redhat.com>
+
+ * pango/pango-layout.c (pango_layout_line_get_x_ranges): fix
+ another "count line lengths to get line start" bug
+
2001-02-12 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_list_insert_internal):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 6bbd3985..34091356 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2001-02-13 Havoc Pennington <hp@redhat.com>
+
+ * pango/pango-layout.c (pango_layout_line_get_x_ranges): fix
+ another "count line lengths to get line start" bug
+
2001-02-12 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_list_insert_internal):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 6bbd3985..34091356 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2001-02-13 Havoc Pennington <hp@redhat.com>
+
+ * pango/pango-layout.c (pango_layout_line_get_x_ranges): fix
+ another "count line lengths to get line start" bug
+
2001-02-12 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_list_insert_internal):
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 73d61d3e..230e2d0a 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -2998,13 +2998,8 @@ pango_layout_line_get_x_ranges (PangoLayoutLine *line,
/* FIXME it seems to me that width can be -1 here? */
get_x_offset (line->layout, line, width, logical_rect.width, &x_offset);
-
- tmp_list = line->layout->lines;
- while (tmp_list->data != line)
- {
- line_start_index += ((PangoLayoutLine *)tmp_list->data)->length;
- tmp_list = tmp_list->next;
- }
+
+ line_start_index = line->start_index;
/* Allocate the maximum possible size */
if (ranges)