[gtk/wip/baedert/for-master: 5/6] fontrendering: Protect against NULL hints
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/for-master: 5/6] fontrendering: Protect against NULL hints
- Date: Sat, 16 Oct 2021 15:41:15 +0000 (UTC)
commit 8f3a83bfe576937565138ef98157713f788b5403
Author: Timm Bäder <mail baedert org>
Date: Sat Oct 16 15:44:58 2021 +0200
fontrendering: Protect against NULL hints
demos/gtk-demo/fontrendering.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/demos/gtk-demo/fontrendering.c b/demos/gtk-demo/fontrendering.c
index c349e54b26..283523f481 100644
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -59,16 +59,18 @@ update_image (void)
fopt = cairo_font_options_copy (pango_cairo_context_get_font_options (context));
hint = gtk_combo_box_get_active_id (GTK_COMBO_BOX (hinting));
- if (strcmp (hint, "none") == 0)
- hintstyle = CAIRO_HINT_STYLE_NONE;
- else if (strcmp (hint, "slight") == 0)
- hintstyle = CAIRO_HINT_STYLE_SLIGHT;
- else if (strcmp (hint, "medium") == 0)
- hintstyle = CAIRO_HINT_STYLE_MEDIUM;
- else if (strcmp (hint, "full") == 0)
- hintstyle = CAIRO_HINT_STYLE_FULL;
- else
- hintstyle = CAIRO_HINT_STYLE_DEFAULT;
+ hintstyle = CAIRO_HINT_STYLE_DEFAULT;
+ if (hint)
+ {
+ if (strcmp (hint, "none") == 0)
+ hintstyle = CAIRO_HINT_STYLE_NONE;
+ else if (strcmp (hint, "slight") == 0)
+ hintstyle = CAIRO_HINT_STYLE_SLIGHT;
+ else if (strcmp (hint, "medium") == 0)
+ hintstyle = CAIRO_HINT_STYLE_MEDIUM;
+ else if (strcmp (hint, "full") == 0)
+ hintstyle = CAIRO_HINT_STYLE_FULL;
+ }
cairo_font_options_set_hint_style (fopt, hintstyle);
if (gtk_check_button_get_active (GTK_CHECK_BUTTON (hint_metrics)))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]