MFH: r553411

math/vtk6: fix build against freetype 2.10.4

- similar patch is applied to math/vtk8

PR:		250375

Approved by:	ports-secteam (implicit)
This commit is contained in:
Tobias C. Berner 2020-10-27 04:21:52 +00:00
parent 627240a9c7
commit 9d2211dfcd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2020Q4/; revision=553412
2 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- Rendering/FreeType/vtkFreeTypeTools.cxx.orig 2020-10-26 19:28:43 UTC
+++ Rendering/FreeType/vtkFreeTypeTools.cxx
@@ -280,7 +280,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache()
}
//----------------------------------------------------------------------------
-FT_CALLBACK_DEF(FT_Error)
+static FT_Error
vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id,
FT_Library lib,
FT_Pointer request_data,

View File

@ -0,0 +1,11 @@
--- Rendering/FreeType/vtkFreeTypeUtilities.cxx.orig 2020-10-26 19:35:51 UTC
+++ Rendering/FreeType/vtkFreeTypeUtilities.cxx
@@ -325,7 +325,7 @@ void vtkFreeTypeUtilities::MapIdToTextProperty(unsigne
//----------------------------------------------------------------------------
#ifdef VTK_FREETYPE_CACHING_SUPPORTED
-FT_CALLBACK_DEF(FT_Error)
+static FT_Error
vtkFreeTypeUtilitiesFaceRequester(FTC_FaceID face_id,
FT_Library lib,
FT_Pointer request_data,