diff options
Diffstat (limited to 'pango')
-rw-r--r-- | pango/pango-coverage.c | 2 | ||||
-rw-r--r-- | pango/pangowin32.c | 3 | ||||
-rw-r--r-- | pango/testfonts.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c index e6c59742..61e94301 100644 --- a/pango/pango-coverage.c +++ b/pango/pango-coverage.c @@ -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 5c745827..d1bd5954 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -1339,6 +1339,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]); diff --git a/pango/testfonts.c b/pango/testfonts.c index d49e986f..8c5448c2 100644 --- a/pango/testfonts.c +++ b/pango/testfonts.c @@ -192,7 +192,7 @@ int main (int argc, char **argv) PangoGlyphString * glyphs; char s[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz" - "1234567890 -+*/!§$%&()[]{}<>|#=?@"; + "1234567890 -+*/!\xc2\xa7$%&()[]{}<>|#=?@"; g_get_current_time (&tv0); coverage = pango_font_get_coverage (font, lang); |