diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-01-29 00:44:17 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-01-29 00:44:17 +0000 |
| commit | a8bc8ab1556a2e0a7d01ac3c997f51f4ac33907b (patch) | |
| tree | 50ff4963558191c94f16443920a11f2fc3b94246 | |
| parent | 0590ccf215b0df243825a1b5fd395926c781f66c (diff) | |
| download | pango-a8bc8ab1556a2e0a7d01ac3c997f51f4ac33907b.tar.gz | |
Add some return-if-fails to catch loading size 0 fonts.
Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_context_load_font[set]): Add some
return-if-fails to catch loading size 0 fonts.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/pango-context.c | 2 |
8 files changed, 37 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font[set]): Add some + return-if-fails to catch loading size 0 fonts. + Thu Jan 24 18:05:54 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (get_items_log_attrs): Fix problems with diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 9a67b853..894b8bef 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,8 @@ +Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font[set]): Add some + return-if-fails to catch loading size 0 fonts. + Thu Jan 24 18:05:54 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (get_items_log_attrs): Fix problems with diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 9a67b853..894b8bef 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font[set]): Add some + return-if-fails to catch loading size 0 fonts. + Thu Jan 24 18:05:54 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (get_items_log_attrs): Fix problems with diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 9a67b853..894b8bef 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font[set]): Add some + return-if-fails to catch loading size 0 fonts. + Thu Jan 24 18:05:54 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (get_items_log_attrs): Fix problems with diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 9a67b853..894b8bef 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font[set]): Add some + return-if-fails to catch loading size 0 fonts. + Thu Jan 24 18:05:54 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (get_items_log_attrs): Fix problems with diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 9a67b853..894b8bef 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font[set]): Add some + return-if-fails to catch loading size 0 fonts. + Thu Jan 24 18:05:54 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (get_items_log_attrs): Fix problems with diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 9a67b853..894b8bef 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Mon Jan 28 19:41:20 2002 Owen Taylor <otaylor@redhat.com> + + * pango/pango-context.c (pango_context_load_font[set]): Add some + return-if-fails to catch loading size 0 fonts. + Thu Jan 24 18:05:54 2002 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (get_items_log_attrs): Fix problems with diff --git a/pango/pango-context.c b/pango/pango-context.c index 2f5d3aa5..7ed5b5ef 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -215,6 +215,7 @@ pango_context_load_font (PangoContext *context, { g_return_val_if_fail (context != NULL, NULL); g_return_val_if_fail (pango_font_description_get_family (desc) != NULL, NULL); + g_return_val_if_fail (pango_font_description_get_size (desc) != 0, NULL); return pango_font_map_load_font (context->font_map, context, desc); } @@ -237,6 +238,7 @@ pango_context_load_fontset (PangoContext *context, { g_return_val_if_fail (context != NULL, NULL); g_return_val_if_fail (pango_font_description_get_family (desc) != NULL, NULL); + g_return_val_if_fail (pango_font_description_get_size (desc) != 0, NULL); return pango_font_map_load_fontset (context->font_map, context, desc, language); } |