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

closed #3867: "Testing empty labels" in LabelTest crashes on Linux platform.

This commit is contained in:
James Chen 2014-01-27 10:31:24 +08:00
parent 208939ab2a
commit 6c69626a4f
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cocos/2d/platform/linux/CCImage.cpp
View File

@ -450,23 +450,21 @@ static BitmapDC& sharedBitmapDC()
} }
bool Image::initWithString( bool Image::initWithString(
const char * pText, const char * text,
int nWidth/* = 0*/, int width/* = 0*/,
int nHeight/* = 0*/, int height/* = 0*/,
TextAlign eAlignMask/* = kAlignCenter*/, TextAlign alignMask/* = kAlignCenter*/,
const char * pFontName/* = nil*/, const char * fontName/* = nil*/,
int nSize/* = 0*/) int size/* = 0*/)
{ {
bool bRet = false; bool ret = false;
do do
{ {
CC_BREAK_IF(! pText); CC_BREAK_IF(!text || 0 == strlen(text));
BitmapDC &dc = sharedBitmapDC(); BitmapDC &dc = sharedBitmapDC();
//const char* pFullFontName = FileUtils::getInstance()->fullPathFromRelativePath(pFontName); CC_BREAK_IF(! dc.getBitmap(text, width, height, alignMask, fontName, size));
CC_BREAK_IF(! dc.getBitmap(pText, nWidth, nHeight, eAlignMask, pFontName, nSize));
// assign the dc._data to _data in order to save time // assign the dc._data to _data in order to save time
_data = dc._data; _data = dc._data;
@ -478,13 +476,13 @@ bool Image::initWithString(
_preMulti = true; _preMulti = true;
_dataLen = _width * _height * 4; _dataLen = _width * _height * 4;
bRet = true; ret = true;
dc.reset(); dc.reset();
}while (0); }while (0);
//do nothing //do nothing
return bRet; return ret;
} }
NS_CC_END NS_CC_END