Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15048 from aardvarkk/binaryfontfix 

Bitmap font sizes are not loaded from binary .fnt files.
This commit is contained in:
zilongshanren 2016-02-15 21:17:04 +08:00
parent 841ad8ae99 1dbac01659
commit ca7fa1ecd2
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/2d/CCFontFNT.cpp
View File

@ -397,6 +397,7 @@ std::set<unsigned int>* BMFontConfiguration::parseBinaryConfigFile(unsigned char
fontName n+1 string 14 null terminated string with length n
*/
memcpy(&_fontSize, pData, 2);
_padding.top = (unsigned char)pData[7];
_padding.right = (unsigned char)pData[8];
_padding.bottom = (unsigned char)pData[9];