diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-06-02 16:13:03 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-06-02 16:13:03 +0000 |
| commit | dda364c26eeacac0a6a41d89cf291d3671fc570d (patch) | |
| tree | 85f5bd75eeeda0e2aece5c70f6ed59a82d40a9f7 | |
| parent | 986a39cd511cfd1e09d2af96d803ef37f7f10d50 (diff) | |
| download | pango-dda364c26eeacac0a6a41d89cf291d3671fc570d.tar.gz | |
Don't put statements with side-effects inside g_assert()! (#114137, Jeff
Mon Jun 2 12:10:11 2003 Owen Taylor <otaylor@redhat.com>
* pango/pango-glyph-item.c (pango_glyph_item_apply_attrs):
Don't put statements with side-effects inside g_assert()!
(#114137, Jeff Waugh)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 8 | ||||
| -rw-r--r-- | pango/pango-glyph-item.c | 6 |
6 files changed, 38 insertions, 8 deletions
@@ -1,3 +1,9 @@ +Mon Jun 2 12:10:11 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-glyph-item.c (pango_glyph_item_apply_attrs): + Don't put statements with side-effects inside g_assert()! + (#114137, Jeff Waugh) + Thu May 29 20:05:45 2003 Owen Taylor <otaylor@redhat.com> * === Released 1.2.2 === @@ -175,7 +181,7 @@ Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Don't look for Xft unless we found - FreeType. (#109753) + FreeType. (#109573) Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 236e752b..50b3044d 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Mon Jun 2 12:10:11 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-glyph-item.c (pango_glyph_item_apply_attrs): + Don't put statements with side-effects inside g_assert()! + (#114137, Jeff Waugh) + Thu May 29 20:05:45 2003 Owen Taylor <otaylor@redhat.com> * === Released 1.2.2 === @@ -175,7 +181,7 @@ Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Don't look for Xft unless we found - FreeType. (#109753) + FreeType. (#109573) Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 236e752b..50b3044d 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Mon Jun 2 12:10:11 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-glyph-item.c (pango_glyph_item_apply_attrs): + Don't put statements with side-effects inside g_assert()! + (#114137, Jeff Waugh) + Thu May 29 20:05:45 2003 Owen Taylor <otaylor@redhat.com> * === Released 1.2.2 === @@ -175,7 +181,7 @@ Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Don't look for Xft unless we found - FreeType. (#109753) + FreeType. (#109573) Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 236e752b..50b3044d 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Mon Jun 2 12:10:11 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-glyph-item.c (pango_glyph_item_apply_attrs): + Don't put statements with side-effects inside g_assert()! + (#114137, Jeff Waugh) + Thu May 29 20:05:45 2003 Owen Taylor <otaylor@redhat.com> * === Released 1.2.2 === @@ -175,7 +181,7 @@ Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Don't look for Xft unless we found - FreeType. (#109753) + FreeType. (#109573) Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 236e752b..50b3044d 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Mon Jun 2 12:10:11 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-glyph-item.c (pango_glyph_item_apply_attrs): + Don't put statements with side-effects inside g_assert()! + (#114137, Jeff Waugh) + Thu May 29 20:05:45 2003 Owen Taylor <otaylor@redhat.com> * === Released 1.2.2 === @@ -175,7 +181,7 @@ Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> Tue Apr 15 05:47:35 2003 Owen Taylor <otaylor@redhat.com> * configure.in: Don't look for Xft unless we found - FreeType. (#109753) + FreeType. (#109573) Tue Apr 15 05:34:05 2003 Owen Taylor <otaylor@redhat.com> diff --git a/pango/pango-glyph-item.c b/pango/pango-glyph-item.c index c1b40aa9..087f0fa6 100644 --- a/pango/pango-glyph-item.c +++ b/pango/pango-glyph-item.c @@ -315,8 +315,8 @@ pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item, pango_attr_iterator_range (iter, &range_start, &range_end); if (range_end > state.cluster_end) break; - - g_assert (pango_attr_iterator_next (iter)); + + pango_attr_iterator_next (iter); } state.segment_attrs = pango_attr_iterator_get_attrs (iter); @@ -363,7 +363,7 @@ pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item, if (range_end > state.cluster_end) /* Range intersects next cluster */ break; - g_assert (pango_attr_iterator_next (iter)); + pango_attr_iterator_next (iter); pango_attr_iterator_range (iter, &range_start, &range_end); if (range_start >= state.cluster_end) /* New range doesn't intersect this cluster */ |