diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-07-09 17:07:25 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-07-09 17:07:25 +0000 |
| commit | cf7d2330339e54897ec1dd852bfead6ba023eb96 (patch) | |
| tree | 3d39c60f1148086f8f51202b61600f372834d702 /pango/pangowin32-fontmap.c | |
| parent | 40aa32f1329e0d3fe4993c5955b94a24aedea836 (diff) | |
| parent | 587834ca76aa80c2bf950396aa2e1edd0869f589 (diff) | |
| download | pango-cf7d2330339e54897ec1dd852bfead6ba023eb96.tar.gz | |
Merge branch 'win32-cmap-free' into 'master'
pangowin32: Clear cmap on finalize
See merge request GNOME/pango!318
Diffstat (limited to 'pango/pangowin32-fontmap.c')
| -rw-r--r-- | pango/pangowin32-fontmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 4cf2df3a..379bf813 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -678,7 +678,7 @@ create_standard_family (PangoWin32FontMap *win32fontmap, new_face->has_cmap = old_face->has_cmap; new_face->cmap_format = old_face->cmap_format; - new_face->cmap = old_face->cmap; + new_face->cmap = _pango_win32_copy_cmap (old_face->cmap, old_face->cmap_format); new_face->cached_fonts = NULL; @@ -1761,7 +1761,7 @@ pango_win32_face_finalize (GObject *object) g_free (win32face->face_name); - //g_free (win32face->cmap); // Err, cmap does not have lifecycle management currently :( + g_free (win32face->cmap); g_slist_free (win32face->cached_fonts); // g_slist_free_full (win32face->cached_fonts, g_object_unref); // This doesn't work. |