Improve CairoMakie thread safety (#3777)

* improve cairomakie thread safety * add changelog entry
MakieOrg · Apr 10, 2024 · d47671d · d47671d
1 parent 139ddb1
commit d47671d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+- Improved thread safety of rendering with CairoMakie (independent `Scene`s only) by locking FreeType handles [#3777](https://github.com/MakieOrg/Makie.jl/pull/3777).
+
 ## [0.20.9] - 2024-03-29
 
 - Added supported markers hint to unsupported marker warn message [#3666](https://github.com/MakieOrg/Makie.jl/pull/3666).

diff --git a/CairoMakie/src/cairo-extension.jl b/CairoMakie/src/cairo-extension.jl
@@ -20,7 +20,7 @@ end
 
 function set_ft_font(ctx, font)
 
-    font_face = ccall(
+    font_face = Base.@lock font.lock ccall(
         (:cairo_ft_font_face_create_for_ft_face, Cairo.libcairo),
         Ptr{Cvoid}, (Makie.FreeTypeAbstraction.FT_Face, Cint),
         font, 0

diff --git a/CairoMakie/src/utils.jl b/CairoMakie/src/utils.jl
@@ -250,9 +250,9 @@ Finds a font that can represent the unicode character!
 Returns Makie.defaultfont() if not representable!
 """
 function best_font(c::Char, font = Makie.defaultfont())
-    if Makie.FreeType.FT_Get_Char_Index(font, c) == 0
+    if Base.@lock font.lock Makie.FreeType.FT_Get_Char_Index(font, c) == 0
         for afont in Makie.alternativefonts()
-            if Makie.FreeType.FT_Get_Char_Index(afont, c) != 0
+            if Base.@lock afont.lock Makie.FreeType.FT_Get_Char_Index(afont, c) != 0
                 return afont
             end
         end

diff --git a/Project.toml b/Project.toml
@@ -77,7 +77,7 @@ FilePaths = "0.8"
 FixedPointNumbers = "0.6, 0.7, 0.8"
 Format = "1.3"
 FreeType = "3.0, 4.0"
-FreeTypeAbstraction = "0.10"
+FreeTypeAbstraction = "0.10.3"
 GeometryBasics = "0.4.2"
 GridLayoutBase = "0.10"
 ImageIO = "0.2, 0.3, 0.4, 0.5, 0.6"