diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-05-22 23:52:20 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-05-22 23:52:20 +0000 |
| commit | cef06051b2c6bd00034088ef659f5bd6976fbbb7 (patch) | |
| tree | 66e412c3367fa7d456fa9949b5f64e13321c7cd2 | |
| parent | a0781c2f486cbd3d53f8baeaf0ce44dee042fde6 (diff) | |
| download | pango-cef06051b2c6bd00034088ef659f5bd6976fbbb7.tar.gz | |
Fix <, <= confusion.
Mon May 22 18:19:32 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (process_item): Fix <, <= confusion.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 4 | ||||
| -rw-r--r-- | pango/pango-layout.c | 2 |
8 files changed, 29 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Mon May 22 18:19:32 2000 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (process_item): Fix <, <= confusion. + Thu May 18 17:30:00 2000 Robert Brady <rwb197@zepler.org> * fonts/devnag18.bdf: Fix advance widths of some glyphs. diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index c455eedb..576b5877 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,7 @@ +Mon May 22 18:19:32 2000 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (process_item): Fix <, <= confusion. + Thu May 18 17:30:00 2000 Robert Brady <rwb197@zepler.org> * fonts/devnag18.bdf: Fix advance widths of some glyphs. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c455eedb..576b5877 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,7 @@ +Mon May 22 18:19:32 2000 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (process_item): Fix <, <= confusion. + Thu May 18 17:30:00 2000 Robert Brady <rwb197@zepler.org> * fonts/devnag18.bdf: Fix advance widths of some glyphs. diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index c455eedb..576b5877 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,7 @@ +Mon May 22 18:19:32 2000 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (process_item): Fix <, <= confusion. + Thu May 18 17:30:00 2000 Robert Brady <rwb197@zepler.org> * fonts/devnag18.bdf: Fix advance widths of some glyphs. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index c455eedb..576b5877 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,7 @@ +Mon May 22 18:19:32 2000 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (process_item): Fix <, <= confusion. + Thu May 18 17:30:00 2000 Robert Brady <rwb197@zepler.org> * fonts/devnag18.bdf: Fix advance widths of some glyphs. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index c455eedb..576b5877 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,7 @@ +Mon May 22 18:19:32 2000 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (process_item): Fix <, <= confusion. + Thu May 18 17:30:00 2000 Robert Brady <rwb197@zepler.org> * fonts/devnag18.bdf: Fix advance widths of some glyphs. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index c455eedb..576b5877 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,7 @@ +Mon May 22 18:19:32 2000 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (process_item): Fix <, <= confusion. + Thu May 18 17:30:00 2000 Robert Brady <rwb197@zepler.org> * fonts/devnag18.bdf: Fix advance widths of some glyphs. diff --git a/pango/pango-layout.c b/pango/pango-layout.c index a90688ec..08af0edc 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -1491,7 +1491,7 @@ process_item (PangoLayoutLine *line, for (i=0; i < glyphs->num_glyphs; i++) width += glyphs->glyphs[i].geometry.width; - if (width < *remaining_width && !no_break_at_end) + if (width <= *remaining_width && !no_break_at_end) { *remaining_width -= width; insert_run (line, item, glyphs); |