scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix runtime check error on VS2013 in freetype

Browse source
This commit is contained in:
Scott Graham 2014-04-16 20:49:26 -07:00
parent bc36c29f2a
commit 18c9372677
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
3rdparty/freetype/freetype.h vendored
View file

@ -25152,7 +25152,7 @@ FT_END_HEADER
{ {
FT_Error error; FT_Error error;
FT_Memory memory; FT_Memory memory;
FT_Module module; FT_Module module = NULL;
FT_UInt nn; FT_UInt nn;
#define FREETYPE_VER_FIXED ( ( (FT_Long)FREETYPE_MAJOR << 16 ) | \ #define FREETYPE_VER_FIXED ( ( (FT_Long)FREETYPE_MAJOR << 16 ) | \
FREETYPE_MINOR ) FREETYPE_MINOR )
@ -107542,8 +107542,8 @@ FT_END_HEADER
FT_Outline* outline = NULL; FT_Outline* outline = NULL;
FT_BBox cbox; FT_BBox cbox;
FT_Pos width, height, pitch; FT_Pos width, height, pitch;
FT_Bitmap* bitmap; FT_Bitmap* bitmap = NULL;
FT_Memory memory; FT_Memory memory = NULL;
FT_Int hmul = mode == FT_RENDER_MODE_LCD; FT_Int hmul = mode == FT_RENDER_MODE_LCD;
FT_Int vmul = mode == FT_RENDER_MODE_LCD_V; FT_Int vmul = mode == FT_RENDER_MODE_LCD_V;
FT_Pos x_shift, y_shift, x_left, y_top; FT_Pos x_shift, y_shift, x_left, y_top;