From 49a645cd2d234ee1f9d922cc41d4065c24609ed4 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Mon, 4 Oct 2010 20:17:08 +1300 Subject: [PATCH] fix ubuntu-64 support (Tao.FreeType was quite bogus.) --- OpenRA.Game/Graphics/SpriteFont.cs | 9 ++++++--- thirdparty/Tao/Tao.FreeType.dll | Bin 24576 -> 23552 bytes 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/Graphics/SpriteFont.cs b/OpenRA.Game/Graphics/SpriteFont.cs index 2d3f055991..5fb8a8e7c5 100644 --- a/OpenRA.Game/Graphics/SpriteFont.cs +++ b/OpenRA.Game/Graphics/SpriteFont.cs @@ -80,17 +80,20 @@ namespace OpenRA.Graphics GlyphInfo CreateGlyph(Pair c) { var index = FT.FT_Get_Char_Index(face, (uint)c.First); - FT.FT_Load_Glyph(face, index, FT.FT_LOAD_RENDER); + if (0 != FT.FT_Load_Glyph(face, index, FT.FT_LOAD_RENDER)) + throw new InvalidOperationException( "FT_Load_Glyph failed." ); var _face = (FT_FaceRec)Marshal.PtrToStructure(face, typeof(FT_FaceRec)); var _glyph = (FT_GlyphSlotRec)Marshal.PtrToStructure(_face.glyph, typeof(FT_GlyphSlotRec)); - var s = builder.Allocate(new Size(_glyph.metrics.width >> 6, _glyph.metrics.height >> 6)); + var s = builder.Allocate( + new Size(_glyph.metrics.width.ToInt32() >> 6, + _glyph.metrics.height.ToInt32() >> 6)); var g = new GlyphInfo { Sprite = s, - Advance = _glyph.metrics.horiAdvance / 64f, + Advance = _glyph.metrics.horiAdvance.ToInt32() / 64f, Offset = { X = _glyph.bitmap_left, Y = -_glyph.bitmap_top } }; diff --git a/thirdparty/Tao/Tao.FreeType.dll b/thirdparty/Tao/Tao.FreeType.dll index 15ccb306d2891fe692e250ca4f981098b1e30a06..a07e35673bea0e770241806e13c59ebd84849c19 100755 GIT binary patch delta 8524 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 LyU{oLqVGQega^(O