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

Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5343

This commit is contained in:
James Chen 2014-02-14 09:44:06 +08:00
parent 17dab13502 1c6250bf00
commit 8700d0f64e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/platform/ios/CCDevice.mm
View File

@ -482,7 +482,7 @@ Data Device::getTextureDataForText(const char * text,const FontDefinition& textD
break;
}
height = (short)info.height;
widht = (short)info.width;
width = (short)info.width;
ret.fastSet(info.data,width * height * 4);
} while (0);

2
cocos/2d/platform/mac/CCDevice.mm
View File

@ -224,7 +224,7 @@ Data Device::getTextureDataForText(const char * text,const FontDefinition& textD
break;
}
height = (short)info.height;
widht = (short)info.width;
width = (short)info.width;
ret.fastSet(info.data,width * height * 4);
} while (0);