diff options
| author | Tor Lillqvist <tml@iki.fi> | 2003-01-29 03:33:44 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2003-01-29 03:33:44 +0000 |
| commit | bcee2406055cd3d6ede0f55aaa4ed0843a676129 (patch) | |
| tree | e121181c37a44fcf600398a09bcaf8443d98377b | |
| parent | cd535574bf46be12d94b83072b99af7365d58644 (diff) | |
| download | pango-bcee2406055cd3d6ede0f55aaa4ed0843a676129.tar.gz | |
g_return_if_fail for index >= 0 was the wrong way.
2003-01-29 Tor Lillqvist <tml@iki.fi>
* pango/pango-coverage.c (pango_coverage_get/set):
g_return_if_fail for index >= 0 was the wrong way.
* pango/pangowin32.c (pango_win32_font_calc_coverage): Break out
of loop if char is 0xFFFF. Some fonts have tables terminated like
this.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
| -rw-r--r-- | pango/pango-coverage.c | 4 | ||||
| -rw-r--r-- | pango/pangowin32.c | 3 |
7 files changed, 50 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2003-01-29 Tor Lillqvist <tml@iki.fi> + + * pango/pango-coverage.c (pango_coverage_get/set): + g_return_if_fail for index >= 0 was the wrong way. + + * pango/pangowin32.c (pango_win32_font_calc_coverage): Break out + of loop if char is 0xFFFF. Some fonts have tables terminated like + this. + Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_set/get): Fix diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 98d5131b..e2eb4f99 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +2003-01-29 Tor Lillqvist <tml@iki.fi> + + * pango/pango-coverage.c (pango_coverage_get/set): + g_return_if_fail for index >= 0 was the wrong way. + + * pango/pangowin32.c (pango_win32_font_calc_coverage): Break out + of loop if char is 0xFFFF. Some fonts have tables terminated like + this. + Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_set/get): Fix diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 98d5131b..e2eb4f99 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +2003-01-29 Tor Lillqvist <tml@iki.fi> + + * pango/pango-coverage.c (pango_coverage_get/set): + g_return_if_fail for index >= 0 was the wrong way. + + * pango/pangowin32.c (pango_win32_font_calc_coverage): Break out + of loop if char is 0xFFFF. Some fonts have tables terminated like + this. + Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_set/get): Fix diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 98d5131b..e2eb4f99 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +2003-01-29 Tor Lillqvist <tml@iki.fi> + + * pango/pango-coverage.c (pango_coverage_get/set): + g_return_if_fail for index >= 0 was the wrong way. + + * pango/pangowin32.c (pango_win32_font_calc_coverage): Break out + of loop if char is 0xFFFF. Some fonts have tables terminated like + this. + Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_set/get): Fix diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 98d5131b..e2eb4f99 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +2003-01-29 Tor Lillqvist <tml@iki.fi> + + * pango/pango-coverage.c (pango_coverage_get/set): + g_return_if_fail for index >= 0 was the wrong way. + + * pango/pangowin32.c (pango_win32_font_calc_coverage): Break out + of loop if char is 0xFFFF. Some fonts have tables terminated like + this. + Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com> * pango/pango-coverage.c (pango_coverage_set/get): Fix diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c index e91fd3ef..65c87e06 100644 --- a/pango/pango-coverage.c +++ b/pango/pango-coverage.c @@ -169,7 +169,7 @@ pango_coverage_get (PangoCoverage *coverage, int block_index; g_return_val_if_fail (coverage != NULL, PANGO_COVERAGE_NONE); - g_return_val_if_fail (index < 0, PANGO_COVERAGE_NONE); + g_return_val_if_fail (index >= 0, PANGO_COVERAGE_NONE); block_index = index / 256; @@ -207,7 +207,7 @@ pango_coverage_set (PangoCoverage *coverage, guchar *data; g_return_if_fail (coverage != NULL); - g_return_if_fail (index < 0); + g_return_if_fail (index >= 0); g_return_if_fail (level >= 0 || level <= 3); block_index = index / 256; diff --git a/pango/pangowin32.c b/pango/pangowin32.c index 5b59dec2..32cc78c1 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -1355,6 +1355,9 @@ pango_win32_font_calc_coverage (PangoFont *font, ch <= end_count[i]; ch++) { + if (ch == 0xFFFF) + break; + id = *(id_range_offset[i]/2 + (ch - start_count[i]) + &id_range_offset[i]); |