Commit c70c98ee authored by Michal Sudolsky's avatar Michal Sudolsky
Browse files

sync access to FT_Library and num_open_faces

parent d2f1667c
Pipeline #233155 passed with stages
in 30 minutes and 28 seconds
...@@ -739,7 +739,6 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled) ...@@ -739,7 +739,6 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled)
_font_map_release_face_lock_held (font_map, entry); _font_map_release_face_lock_held (font_map, entry);
} }
} }
_cairo_ft_unscaled_font_map_unlock ();
error = FT_New_Face (font_map->ft_library, error = FT_New_Face (font_map->ft_library,
unscaled->filename, unscaled->filename,
...@@ -747,6 +746,7 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled) ...@@ -747,6 +746,7 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled)
&face); &face);
if (error) if (error)
{ {
_cairo_ft_unscaled_font_map_unlock ();
unscaled->lock_count--; unscaled->lock_count--;
CAIRO_MUTEX_UNLOCK (unscaled->mutex); CAIRO_MUTEX_UNLOCK (unscaled->mutex);
_cairo_error_throw (_ft_to_cairo_error (error)); _cairo_error_throw (_ft_to_cairo_error (error));
...@@ -760,6 +760,8 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled) ...@@ -760,6 +760,8 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled)
font_map->num_open_faces++; font_map->num_open_faces++;
_cairo_ft_unscaled_font_map_unlock ();
return face; return face;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment