diff --git a/ChangeLog b/ChangeLog index 24c0580805..82fb2a0990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-12-28 Tor Lillqvist + + * gdk/win32/gdkfont-win32.c: Use G_N_ELEMENTS(). + (unicode_classify): Don't fail with an assertion on encountering + an unclassified character, but punt and return U_BASIC_LATIN. + 2001-12-23 Tor Lillqvist * gdk/win32/*.c: Lint cleanup. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 24c0580805..82fb2a0990 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-12-28 Tor Lillqvist + + * gdk/win32/gdkfont-win32.c: Use G_N_ELEMENTS(). + (unicode_classify): Don't fail with an assertion on encountering + an unclassified character, but punt and return U_BASIC_LATIN. + 2001-12-23 Tor Lillqvist * gdk/win32/*.c: Lint cleanup. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 24c0580805..82fb2a0990 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-12-28 Tor Lillqvist + + * gdk/win32/gdkfont-win32.c: Use G_N_ELEMENTS(). + (unicode_classify): Don't fail with an assertion on encountering + an unclassified character, but punt and return U_BASIC_LATIN. + 2001-12-23 Tor Lillqvist * gdk/win32/*.c: Lint cleanup. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 24c0580805..82fb2a0990 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-12-28 Tor Lillqvist + + * gdk/win32/gdkfont-win32.c: Use G_N_ELEMENTS(). + (unicode_classify): Don't fail with an assertion on encountering + an unclassified character, but punt and return U_BASIC_LATIN. + 2001-12-23 Tor Lillqvist * gdk/win32/*.c: Lint cleanup. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 24c0580805..82fb2a0990 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-12-28 Tor Lillqvist + + * gdk/win32/gdkfont-win32.c: Use G_N_ELEMENTS(). + (unicode_classify): Don't fail with an assertion on encountering + an unclassified character, but punt and return U_BASIC_LATIN. + 2001-12-23 Tor Lillqvist * gdk/win32/*.c: Lint cleanup. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 24c0580805..82fb2a0990 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-12-28 Tor Lillqvist + + * gdk/win32/gdkfont-win32.c: Use G_N_ELEMENTS(). + (unicode_classify): Don't fail with an assertion on encountering + an unclassified character, but punt and return U_BASIC_LATIN. + 2001-12-23 Tor Lillqvist * gdk/win32/*.c: Lint cleanup. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 24c0580805..82fb2a0990 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-12-28 Tor Lillqvist + + * gdk/win32/gdkfont-win32.c: Use G_N_ELEMENTS(). + (unicode_classify): Don't fail with an assertion on encountering + an unclassified character, but punt and return U_BASIC_LATIN. + 2001-12-23 Tor Lillqvist * gdk/win32/*.c: Lint cleanup. diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c index 28e1e61d10..89401ab415 100644 --- a/gdk/win32/gdkfont-win32.c +++ b/gdk/win32/gdkfont-win32.c @@ -710,12 +710,12 @@ static void print_unicode_subranges (FONTSIGNATURE *fsp) { int i; - gboolean checked[sizeof (utab) / sizeof (utab[0])]; + gboolean checked[G_N_ELEMENTS (utab)]; gboolean need_comma = FALSE; memset (checked, 0, sizeof (checked)); - for (i = 0; i < sizeof (utab) / sizeof (utab[0]); i++) + for (i = 0; i < G_N_ELEMENTS (utab); i++) if (!checked[i] && (fsp->fsUsb[utab[i].bit/32] & (1 << (utab[i].bit % 32)))) { @@ -1725,7 +1725,7 @@ static int unicode_classify (wchar_t wc) { int min = 0; - int max = sizeof (utab) / sizeof (utab[0]) - 1; + int max = G_N_ELEMENTS (utab) - 1; int mid; while (max >= min) @@ -1738,10 +1738,10 @@ unicode_classify (wchar_t wc) else if (utab[mid].low <= wc && wc <= utab[mid].high) return utab[mid].bit; else - return -1; + break; } - g_assert_not_reached (); - return -1; + /* Punt */ + return U_BASIC_LATIN; } static GdkWin32SingleFont*