]>
Commit | Line | Data |
---|---|---|
aed6aa39 JP |
1 | --- VTK-8.2.0/Rendering/FreeType/vtkFreeTypeTools.cxx.orig 2019-01-30 18:15:13.000000000 +0100 |
2 | +++ VTK-8.2.0/Rendering/FreeType/vtkFreeTypeTools.cxx 2020-10-17 00:21:55.153442255 +0200 | |
3 | @@ -387,7 +387,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMap | |
4 | } | |
5 | ||
6 | //---------------------------------------------------------------------------- | |
7 | -FT_CALLBACK_DEF(FT_Error) | |
8 | +extern "C" FT_Error | |
9 | vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, | |
10 | FT_Library lib, | |
11 | FT_Pointer request_data, | |
12 | --- VTK-8.2.0/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx.orig 2019-01-30 18:15:13.000000000 +0100 | |
13 | +++ VTK-8.2.0/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx 2020-10-17 00:38:23.457937944 +0200 | |
14 | @@ -26,10 +26,8 @@ | |
15 | ||
16 | vtkStandardNewMacro(vtkFontConfigFreeTypeTools) | |
17 | ||
18 | -namespace | |
19 | -{ | |
20 | // The FreeType face requester callback: | |
21 | -FT_CALLBACK_DEF(FT_Error) | |
22 | +extern "C" FT_Error | |
23 | vtkFontConfigFreeTypeToolsFaceRequester(FTC_FaceID face_id, | |
24 | FT_Library lib, | |
25 | FT_Pointer request_data, | |
26 | @@ -75,7 +73,6 @@ vtkFontConfigFreeTypeToolsFaceRequester( | |
27 | ||
28 | return static_cast<FT_Error>(0); | |
29 | } | |
30 | -} // end anon namespace | |
31 | ||
32 | void vtkFontConfigFreeTypeTools::PrintSelf(ostream &os, vtkIndent indent) | |
33 | { |