summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-07-25 03:13:27 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-07-25 03:13:27 +0000
commitd71d34c3f79a4ea19394b7897810e4130bf8a685 (patch)
treee8c777aa37483c69c949acb908deaca8044bdb87
parente950a63fb104357fb2f0ffaf9a245df626e5da30 (diff)
downloadpango-d71d34c3f79a4ea19394b7897810e4130bf8a685.tar.gz
Fix wrong assertion that was dying on lines separated by PS (U+2029).
Wed Jul 24 23:07:43 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c: Fix wrong assertion that was dying on lines separated by PS (U+2029). (#88824, Choe Hwangjin)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-26
-rw-r--r--ChangeLog.pre-1-46
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/pango-layout.c2
7 files changed, 37 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fc28d6ee..ace27550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 24 23:07:43 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-layout.c: Fix wrong assertion that was
+ dying on lines separated by PS (U+2029). (#88824,
+ Choe Hwangjin)
+
2002-07-22 Sven Neumann <sven@gimp.org>
* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index fc28d6ee..ace27550 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Wed Jul 24 23:07:43 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-layout.c: Fix wrong assertion that was
+ dying on lines separated by PS (U+2029). (#88824,
+ Choe Hwangjin)
+
2002-07-22 Sven Neumann <sven@gimp.org>
* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index fc28d6ee..ace27550 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,9 @@
+Wed Jul 24 23:07:43 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-layout.c: Fix wrong assertion that was
+ dying on lines separated by PS (U+2029). (#88824,
+ Choe Hwangjin)
+
2002-07-22 Sven Neumann <sven@gimp.org>
* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index fc28d6ee..ace27550 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Wed Jul 24 23:07:43 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-layout.c: Fix wrong assertion that was
+ dying on lines separated by PS (U+2029). (#88824,
+ Choe Hwangjin)
+
2002-07-22 Sven Neumann <sven@gimp.org>
* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index fc28d6ee..ace27550 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Wed Jul 24 23:07:43 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-layout.c: Fix wrong assertion that was
+ dying on lines separated by PS (U+2029). (#88824,
+ Choe Hwangjin)
+
2002-07-22 Sven Neumann <sven@gimp.org>
* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index fc28d6ee..ace27550 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Wed Jul 24 23:07:43 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pango-layout.c: Fix wrong assertion that was
+ dying on lines separated by PS (U+2029). (#88824,
+ Choe Hwangjin)
+
2002-07-22 Sven Neumann <sven@gimp.org>
* pango/pangoft2.c (pango_ft2_font_get_face): don't access the old
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 026d77e0..6cef2677 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -2898,7 +2898,7 @@ pango_layout_check_lines (PangoLayout *layout)
g_assert (end <= (layout->text + layout->length));
g_assert (start <= (layout->text + layout->length));
- g_assert (delim_len < 3);
+ g_assert (delim_len < 4); /* PS is 3 bytes */
g_assert (delim_len >= 0);
state.items = pango_itemize (layout->context,