summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-07-18 16:22:35 -0700
committerMatthias Clasen <mclasen@redhat.com>2019-07-18 16:23:19 -0700
commitc80f0fcf71fd67c6b06039de37bc67e3ecace931 (patch)
tree461cc017dbd4a3b7392aa232ff117ed8728a7652 /pango
parentfdd9e9e707e42131e7749d8674c59f57e0923a35 (diff)
downloadpango-c80f0fcf71fd67c6b06039de37bc67e3ecace931.tar.gz
Make hb fonts immutable in the frontend
It makes more sense to do this in the frontend that hands the objects out, rather than in each backend implementation.
Diffstat (limited to 'pango')
-rw-r--r--pango/fonts.c2
-rw-r--r--pango/pangocoretext.c2
-rw-r--r--pango/pangofc-font.c2
-rw-r--r--pango/pangowin32.c2
4 files changed, 2 insertions, 6 deletions
diff --git a/pango/fonts.c b/pango/fonts.c
index 4ba9d3fe..262ed15f 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -1879,6 +1879,8 @@ pango_font_get_hb_font (PangoFont *font)
priv->hb_font = PANGO_FONT_GET_CLASS (font)->create_hb_font (font);
+ hb_font_make_immutable (priv->hb_font);
+
return priv->hb_font;
}
diff --git a/pango/pangocoretext.c b/pango/pangocoretext.c
index 70fd67d4..5faac64c 100644
--- a/pango/pangocoretext.c
+++ b/pango/pangocoretext.c
@@ -223,8 +223,6 @@ pango_core_text_font_create_hb_font (PangoFont *font)
hb_font = hb_coretext_font_create (ctfont->priv->font_ref);
hb_font_set_scale (hb_font, size, size);
- hb_font_make_immutable (hb_font);
-
return hb_font;
}
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index 76afdf7e..22f6df0c 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -1029,7 +1029,5 @@ pango_fc_font_create_hb_font (PangoFont *font)
}
}
- hb_font_make_immutable (hb_font);
-
return hb_font;
}
diff --git a/pango/pangowin32.c b/pango/pangowin32.c
index 0e877820..32f050e2 100644
--- a/pango/pangowin32.c
+++ b/pango/pangowin32.c
@@ -1990,7 +1990,5 @@ pango_win32_font_create_hb_font (PangoFont *font)
hb_font_set_scale (hb_font, win32font->size, win32font->size);
hb_face_destroy (face);
- hb_font_make_immutable (hb_font);
-
return hb_font;
}