| Index: core/src/fxge/ge/fx_ge_font.cpp
|
| diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/src/fxge/ge/fx_ge_font.cpp
|
| index 46eecff32331c629c51805d7deef1f1fed3537af..4c6da4edc3a0d78cb0351227ece9ae7c8b247cce 100644
|
| --- a/core/src/fxge/ge/fx_ge_font.cpp
|
| +++ b/core/src/fxge/ge/fx_ge_font.cpp
|
| @@ -137,9 +137,9 @@ extern "C" {
|
| {
|
| }
|
| };
|
| -FX_BOOL _LoadFile(FXFT_Library library, FXFT_Face* Face, IFX_FileRead* pFile, FXFT_Stream* stream, FX_INT32 faceIndex = 0)
|
| +FX_BOOL _LoadFile(FXFT_Library library, FXFT_Face* Face, IFX_FileRead* pFile, FXFT_Stream* stream, int32_t faceIndex = 0)
|
| {
|
| - FXFT_Stream stream1 = (FXFT_Stream)FX_Alloc(FX_BYTE, sizeof (FXFT_StreamRec));
|
| + FXFT_Stream stream1 = (FXFT_Stream)FX_Alloc(uint8_t, sizeof (FXFT_StreamRec));
|
| stream1->base = NULL;
|
| stream1->size = (unsigned long)pFile->GetSize();
|
| stream1->pos = 0;
|
| @@ -209,7 +209,7 @@ static FXFT_Face FT_LoadFont(FX_LPBYTE pData, int size)
|
| }
|
| FX_BOOL CFX_Font::LoadEmbedded(FX_LPCBYTE data, FX_DWORD size)
|
| {
|
| - m_pFontDataAllocation = FX_Alloc(FX_BYTE, size);
|
| + m_pFontDataAllocation = FX_Alloc(uint8_t, size);
|
| FXSYS_memcpy32(m_pFontDataAllocation, data, size);
|
| m_Face = FT_LoadFont((FX_LPBYTE)m_pFontDataAllocation, size);
|
| m_pFontData = (FX_LPBYTE)m_pFontDataAllocation;
|
|
|