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

Update variable name.

This commit is contained in:
Dhilan007 2014-03-27 17:48:16 +08:00
parent 5a572c1797
commit f2cc3a3ce2
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cocos/2d/CCFontFreeType.cpp
View File

@ -39,8 +39,8 @@ FT_Library FontFreeType::_FTlibrary;
bool FontFreeType::_FTInitialized = false; bool FontFreeType::_FTInitialized = false;
const int FontFreeType::DistanceMapSpread = 3; const int FontFreeType::DistanceMapSpread = 3;
static std::unordered_map<std::string, Data> CacheFontData; static std::unordered_map<std::string, Data> s_cacheFontData;
static std::unordered_map<std::string, int> CacheFontDataRef; static std::unordered_map<std::string, int> s_cacheFontDataRef;
FontFreeType * FontFreeType::create(const std::string &fontName, int fontSize, GlyphCollection glyphs, const char *customGlyphs,bool distanceFieldEnabled /* = false */,int outline /* = 0 */) FontFreeType * FontFreeType::create(const std::string &fontName, int fontSize, GlyphCollection glyphs, const char *customGlyphs,bool distanceFieldEnabled /* = false */,int outline /* = 0 */)
{ {
@ -109,30 +109,30 @@ bool FontFreeType::createFontObject(const std::string &fontName, int fontSize)
{ {
FT_Face face; FT_Face face;
auto fielDataIterator = CacheFontData.find(fontName); auto fielDataIterator = s_cacheFontData.find(fontName);
if (fielDataIterator != CacheFontData.end()) if (fielDataIterator != s_cacheFontData.end())
{ {
auto temp = CacheFontDataRef.find(fontName); auto temp = s_cacheFontDataRef.find(fontName);
if (temp != CacheFontDataRef.end()) if (temp != s_cacheFontDataRef.end())
{ {
(*temp).second += 1; (*temp).second += 1;
} }
else else
{ {
CacheFontDataRef[fontName] = 1; s_cacheFontDataRef[fontName] = 1;
} }
} }
else else
{ {
CacheFontDataRef[fontName] = 1; s_cacheFontDataRef[fontName] = 1;
CacheFontData[fontName] = FileUtils::getInstance()->getDataFromFile(fontName); s_cacheFontData[fontName] = FileUtils::getInstance()->getDataFromFile(fontName);
if (CacheFontData[fontName].isNull()) if (s_cacheFontData[fontName].isNull())
{ {
return false; return false;
} }
} }
if (FT_New_Memory_Face(getFTLibrary(), CacheFontData[fontName].getBytes(), CacheFontData[fontName].getSize(), 0, &face )) if (FT_New_Memory_Face(getFTLibrary(), s_cacheFontData[fontName].getBytes(), s_cacheFontData[fontName].getSize(), 0, &face ))
return false; return false;
//we want to use unicode //we want to use unicode
@ -166,11 +166,11 @@ FontFreeType::~FontFreeType()
FT_Done_Face(_fontRef); FT_Done_Face(_fontRef);
} }
CacheFontDataRef[_fontName] -= 1; s_cacheFontDataRef[_fontName] -= 1;
if (CacheFontDataRef[_fontName] == 0) if (s_cacheFontDataRef[_fontName] == 0)
{ {
CacheFontDataRef.erase(_fontName); s_cacheFontDataRef.erase(_fontName);
CacheFontData.erase(_fontName); s_cacheFontData.erase(_fontName);
} }
} }