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

issue #1024: Made blackberry/CCImage.cpp compiled ok.

This commit is contained in:
James Chen 2012-10-17 10:57:21 +08:00
parent 48cc756d88
commit ddfc08904a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cocos2dx/platform/blackberry/CCImage.cpp
View File

@ -21,15 +21,18 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#define __CC_PLATFORM_IMAGE_CPP__
#include "platform/CCImageCommon_cpp.h"
#include <string.h> #include <string.h>
#include <vector> #include <vector>
#include <string> #include <string>
#include <sstream> #include <sstream>
#include "CCImage.h" #include "platform/CCImage.h"
#include "CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "platform/CCCommon.h"
#include "CCStdC.h"
#include "SkTypeface.h" #include "SkTypeface.h"
#include "SkBitmap.h" #include "SkBitmap.h"
@ -50,7 +53,7 @@ struct TextLine {
int iLineWidth; int iLineWidth;
}; };
NS_CC_BEGIN; NS_CC_BEGIN
class BitmapDC class BitmapDC
{ {
@ -502,7 +505,7 @@ bool CCImage::initWithString(
bRet = true; bRet = true;
#endif #endif
const char* pFullFontName = CCFileUtils::fullPathFromRelativePath(pFontName); const char* pFullFontName = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath(pFontName);
//CCLog("-----pText=%s and Font File is %s nWidth= %d,nHeight=%d",pText,pFullFontName,nWidth,nHeight); //CCLog("-----pText=%s and Font File is %s nWidth= %d,nHeight=%d",pText,pFullFontName,nWidth,nHeight);
CC_BREAK_IF(! dc.getBitmap(pText, nWidth, nHeight, eAlignMask, pFullFontName, nSize)); CC_BREAK_IF(! dc.getBitmap(pText, nWidth, nHeight, eAlignMask, pFullFontName, nSize));
@ -527,5 +530,5 @@ bool CCImage::initWithString(
return bRet; return bRet;
} }
NS_CC_END; NS_CC_END