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_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.

	Merge from HEAD:
	* pango/testfonts.c: Convert literal ISO-8859-1
	to UTF-8 hex escapes.

8 files changed, 70 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index bb76120a..4af96154 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-01-29  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pango-coverage.c (pango_coverage_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.
+
+	Merge from HEAD:
+	* pango/testfonts.c: Convert literal ISO-8859-1
+	to UTF-8 hex escapes.
+
 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 bb76120a..4af96154 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,16 @@
+2003-01-29  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pango-coverage.c (pango_coverage_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.
+
+	Merge from HEAD:
+	* pango/testfonts.c: Convert literal ISO-8859-1
+	to UTF-8 hex escapes.
+
 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 bb76120a..4af96154 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,16 @@
+2003-01-29  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pango-coverage.c (pango_coverage_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.
+
+	Merge from HEAD:
+	* pango/testfonts.c: Convert literal ISO-8859-1
+	to UTF-8 hex escapes.
+
 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 bb76120a..4af96154 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,16 @@
+2003-01-29  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pango-coverage.c (pango_coverage_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.
+
+	Merge from HEAD:
+	* pango/testfonts.c: Convert literal ISO-8859-1
+	to UTF-8 hex escapes.
+
 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 bb76120a..4af96154 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,16 @@
+2003-01-29  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pango-coverage.c (pango_coverage_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.
+
+	Merge from HEAD:
+	* pango/testfonts.c: Convert literal ISO-8859-1
+	to UTF-8 hex escapes.
+
 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 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);