mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-26 13:41:07 +00:00
fontrendering: Protect against NULL hints
This commit is contained in:
parent
beda50f631
commit
a61999170e
@ -59,16 +59,18 @@ update_image (void)
|
|||||||
fopt = cairo_font_options_copy (pango_cairo_context_get_font_options (context));
|
fopt = cairo_font_options_copy (pango_cairo_context_get_font_options (context));
|
||||||
|
|
||||||
hint = gtk_combo_box_get_active_id (GTK_COMBO_BOX (hinting));
|
hint = gtk_combo_box_get_active_id (GTK_COMBO_BOX (hinting));
|
||||||
if (strcmp (hint, "none") == 0)
|
hintstyle = CAIRO_HINT_STYLE_DEFAULT;
|
||||||
hintstyle = CAIRO_HINT_STYLE_NONE;
|
if (hint)
|
||||||
else if (strcmp (hint, "slight") == 0)
|
{
|
||||||
hintstyle = CAIRO_HINT_STYLE_SLIGHT;
|
if (strcmp (hint, "none") == 0)
|
||||||
else if (strcmp (hint, "medium") == 0)
|
hintstyle = CAIRO_HINT_STYLE_NONE;
|
||||||
hintstyle = CAIRO_HINT_STYLE_MEDIUM;
|
else if (strcmp (hint, "slight") == 0)
|
||||||
else if (strcmp (hint, "full") == 0)
|
hintstyle = CAIRO_HINT_STYLE_SLIGHT;
|
||||||
hintstyle = CAIRO_HINT_STYLE_FULL;
|
else if (strcmp (hint, "medium") == 0)
|
||||||
else
|
hintstyle = CAIRO_HINT_STYLE_MEDIUM;
|
||||||
hintstyle = CAIRO_HINT_STYLE_DEFAULT;
|
else if (strcmp (hint, "full") == 0)
|
||||||
|
hintstyle = CAIRO_HINT_STYLE_FULL;
|
||||||
|
}
|
||||||
cairo_font_options_set_hint_style (fopt, hintstyle);
|
cairo_font_options_set_hint_style (fopt, hintstyle);
|
||||||
|
|
||||||
if (gtk_check_button_get_active (GTK_CHECK_BUTTON (hint_metrics)))
|
if (gtk_check_button_get_active (GTK_CHECK_BUTTON (hint_metrics)))
|
||||||
|
Loading…
Reference in New Issue
Block a user