diff --git a/MonoGame.Framework.Content.Pipeline/Utilities/FreeTypeAPI.cs b/MonoGame.Framework.Content.Pipeline/Utilities/FreeTypeAPI.cs index c41a32ee8ed..715bb20d816 100644 --- a/MonoGame.Framework.Content.Pipeline/Utilities/FreeTypeAPI.cs +++ b/MonoGame.Framework.Content.Pipeline/Utilities/FreeTypeAPI.cs @@ -5,6 +5,8 @@ using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using FT_Long = System.IntPtr; + namespace FreeTypeAPI { enum FT_Pixel_Mode @@ -52,19 +54,6 @@ unsafe struct FT_Library public int version_patch; public uint num_modules; - - public fixed long modules[128]; - - public FT_ListRec renderers; - public nint cur_renderer; - public nint auto_hinter; - - public fixed long debug_hooks[4]; - - public fixed long lcd_geometry[6]; - - public int refcount; - }; struct FT_Generic @@ -75,7 +64,7 @@ struct FT_Generic struct FT_BBox { - public long xMin, yMin, xMax, yMax; + public FT_Long xMin, yMin, xMax, yMax; } struct FT_ListRec @@ -85,17 +74,17 @@ struct FT_ListRec struct FT_Vector { - public long x, y; + public FT_Long x, y; } struct FT_Matrix { - public long xx, xy, yx, yy; + public FT_Long xx, xy, yx, yy; } struct FT_Glyph_Metrics { - public long width, height, horiBearingX, horiBearingY, horiAdvance, vertBearingX, vertBearingY, vertAdvance; + public FT_Long width, height, horiBearingX, horiBearingY, horiAdvance, vertBearingX, vertBearingY, vertAdvance; } struct FT_Size_Metrics @@ -103,13 +92,13 @@ struct FT_Size_Metrics public ushort x_ppem; public ushort y_ppem; - public long x_scale; - public long y_scale; + public FT_Long x_scale; + public FT_Long y_scale; - public long ascender; - public long descender; - public long height; - public long max_advance; + public FT_Long ascender; + public FT_Long descender; + public FT_Long height; + public FT_Long max_advance; } unsafe struct FT_Size @@ -155,13 +144,13 @@ struct FT_SubGlyph unsafe struct FT_Face { - public long num_faces; - public long face_index; + public FT_Long num_faces; + public FT_Long face_index; - public long face_flags; - public long style_flags; + public FT_Long face_flags; + public FT_Long style_flags; - public long num_glyphs; + public FT_Long num_glyphs; public nint family_name; public nint style_name; @@ -212,8 +201,8 @@ unsafe struct FT_GlyphSlot public FT_Generic generic; public FT_Glyph_Metrics metrics; - public long linearHoriAdvance; - public long linearVertAdvance; + public FT_Long linearHoriAdvance; + public FT_Long linearVertAdvance; public FT_Vector advance; public FT_Glyph_Format format; @@ -228,10 +217,10 @@ unsafe struct FT_GlyphSlot public FT_SubGlyph* subglyphs; public nint control_data; - public long control_len; + public FT_Long control_len; - public long lsb_delta; - public long rsb_delta; + public FT_Long lsb_delta; + public FT_Long rsb_delta; public nint other;