[android]fixed cocos2d#356,CCLabelTTF::initWithString not crashed anymore.

Author: natural-law

cocos2dx/include/CCLabelTTF.h

@@ -37,10 +37,8 @@ namespace cocos2d{
 	class CC_DLL CCLabelTTF : public CCSprite, public CCLabelProtocol
 	{
 	public:
-		CCLabelTTF()
-			:m_sFontName("")
-		{}
-		virtual ~CCLabelTTF(){ m_sFontName.clear(); }
+		CCLabelTTF() {}
+		virtual ~CCLabelTTF(){}
 		char * description();
 		/** creates a CCLabelTTF from a fontname, alignment, dimension and font size */
 		static CCLabelTTF * labelWithString(const char *label, CCSize dimensions, UITextAlignment alignment, const char *fontName, float fontSize);
@@ -61,9 +59,9 @@ namespace cocos2d{
 	protected:
 		CCSize m_tDimensions;
 		UITextAlignment m_eAlignment;
-		std::string m_sFontName;
+        ccxScopedPtr<std::string> m_pFontName;
 		float m_fFontSize;
-		std::string m_sString;
+        ccxScopedPtr<std::string> m_pString;
 	};
 
 } //namespace cocos2d

cocos2dx/label_nodes/CCLabelTTF.cpp

@@ -57,7 +57,7 @@ namespace cocos2d{
 		{
 			m_tDimensions = CCSizeMake( dimensions.width * CC_CONTENT_SCALE_FACTOR(), dimensions.height * CC_CONTENT_SCALE_FACTOR() );
 			m_eAlignment = alignment;
-			m_sFontName = fontName;
+            m_pFontName.reset(new std::string(fontName));
 			m_fFontSize = fontSize * CC_CONTENT_SCALE_FACTOR();
 			this->setString(label);
 			return true;
@@ -70,7 +70,7 @@ namespace cocos2d{
 		if (CCSprite::init())
 		{
 			m_tDimensions = CCSizeZero;
-			m_sFontName = fontName;
+            m_pFontName.reset(new std::string(fontName));
 			m_fFontSize = fontSize * CC_CONTENT_SCALE_FACTOR();
 			this->setString(label);
 			return true;
@@ -79,18 +79,18 @@ namespace cocos2d{
 	}
 	void CCLabelTTF::setString(const char *label)
 	{
-		m_sString = string(label);
+        m_pString.reset(new std::string(label));
 
 		CCTexture2D *texture;
 		if( CCSize::CCSizeEqualToSize( m_tDimensions, CCSizeZero ) )
 		{
 			texture = new CCTexture2D();
-			texture->initWithString(label, m_sFontName.c_str(), m_fFontSize);
+			texture->initWithString(label, m_pFontName->c_str(), m_fFontSize);
 		}
 		else
 		{
 			texture = new CCTexture2D();
-			texture->initWithString(label, m_tDimensions, m_eAlignment, m_sFontName.c_str(), m_fFontSize);
+			texture->initWithString(label, m_tDimensions, m_eAlignment, m_pFontName->c_str(), m_fFontSize);
 		}
 		this->setTexture(texture);
 		texture->release();
@@ -102,13 +102,13 @@ namespace cocos2d{
 
 	const char* CCLabelTTF::getString(void)
 	{
-		return m_sString.c_str();
+		return m_pString->c_str();
 	}
 
 	char * CCLabelTTF::description()
 	{
 		char *ret = new char[100] ;
-		sprintf(ret, "<CCLabelTTF | FontName = %s, FontSize = %.1f>", m_sFontName.c_str(), m_fFontSize);
+		sprintf(ret, "<CCLabelTTF | FontName = %s, FontSize = %.1f>", m_pFontName->c_str(), m_fFontSize);
 		return ret;
 	}
 }// namespace cocos2d

cocos2dx/platform/CCCommon.h

@@ -55,7 +55,7 @@ struct ccxNewArrayDeleter   { template< class TPTR > void operator()(TPTR p) { d
 @brief	A simple scoped pointer.
 */
 template < class T, class D = ccxNewDeleter >
-class ccxScopedPtr   // noncopyable
+class CC_DLL ccxScopedPtr   // noncopyable
     : private D
 {
 public: