File vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch of Package vtk

Overview Repositories Revisions Requests Users Attributes Meta

File vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch of Package vtk (Revision 903f3ef4f23b17ace39eb20713131a27)

Currently displaying revision 903f3ef4f23b17ace39eb20713131a27 , Show latest

Index: VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx
===================================================================
--- VTK-9.0.1.orig/Rendering/FreeType/vtkFreeTypeTools.cxx
+++ VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx
@@ -378,7 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMap
 }
 
 //----------------------------------------------------------------------------
-FT_CALLBACK_DEF(FT_Error)
+extern "C" FT_Error
 vtkFreeTypeToolsFaceRequester(
   FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
 {
Index: VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx
===================================================================
--- VTK-9.0.1.orig/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx
+++ VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx
@@ -26,10 +26,8 @@
 
 vtkStandardNewMacro(vtkFontConfigFreeTypeTools);
 
-namespace
-{
 // The FreeType face requester callback:
-FT_CALLBACK_DEF(FT_Error)
+extern "C" FT_Error
 vtkFontConfigFreeTypeToolsFaceRequester(
   FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
 {
@@ -71,7 +69,6 @@ vtkFontConfigFreeTypeToolsFaceRequester(
 
   return static_cast<FT_Error>(0);
 }
-} // end anon namespace
 
 void vtkFontConfigFreeTypeTools::PrintSelf(ostream& os, vtkIndent indent)
 {

Places

File vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch of Package vtk (Revision 903f3ef4f23b17ace39eb20713131a27)

Places