1From 6c52693d264ca3dc8e15a92f56cf3a636639bb6c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
3Date: Fri, 28 Oct 2022 22:17:15 +0300
4Subject: [PATCH] freetype: Fix function signatures to match without casts
5
6Clang 16 has got a new stricter warning for casts of function types
7(see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57).
8
9This new warning gets included as part of the existing error
10diagnostic setting of -Wcast-function-type.
11
12This fixes errors like these:
13
14../src/hb-ft.cc:1011:34: error: cast from 'void (*)(FT_Face)' (aka 'void (*)(FT_FaceRec_ *)') to 'FT_Generic_Finalizer' (aka 'void (*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
15    ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
16                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
18Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169]
19---
20 src/hb-ft.cc | 10 ++++++----
21 1 file changed, 6 insertions(+), 4 deletions(-)
22
23diff --git a/src/hb-ft.cc b/src/hb-ft.cc
24index a6beb9f0f..a35e75b18 100644
25--- a/src/hb-ft.cc
26+++ b/src/hb-ft.cc
27@@ -729,8 +729,9 @@ hb_ft_face_create_referenced (FT_Face ft_face)
28 }
29
30 static void
31-hb_ft_face_finalize (FT_Face ft_face)
32+hb_ft_face_finalize (void *arg)
33 {
34+  FT_Face ft_face = (FT_Face) arg;
35   hb_face_destroy ((hb_face_t *) ft_face->generic.data);
36 }
37
38@@ -762,7 +763,7 @@ hb_ft_face_create_cached (FT_Face ft_face)
39       ft_face->generic.finalizer (ft_face);
40
41     ft_face->generic.data = hb_ft_face_create (ft_face, nullptr);
42-    ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
43+    ft_face->generic.finalizer = hb_ft_face_finalize;
44   }
45
46   return hb_face_reference ((hb_face_t *) ft_face->generic.data);
47@@ -949,8 +950,9 @@ get_ft_library ()
48 }
49
50 static void
51-_release_blob (FT_Face ft_face)
52+_release_blob (void *arg)
53 {
54+  FT_Face ft_face = (FT_Face) arg;
55   hb_blob_destroy ((hb_blob_t *) ft_face->generic.data);
56 }
57
58@@ -1032,7 +1034,7 @@ hb_ft_font_set_funcs (hb_font_t *font)
59 #endif
60
61   ft_face->generic.data = blob;
62-  ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob;
63+  ft_face->generic.finalizer = _release_blob;
64
65   _hb_ft_font_set_funcs (font, ft_face, true);
66   hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
67--
682.39.2
69
70