diff --git a/core/2d/CCFontAtlas.cpp b/core/2d/CCFontAtlas.cpp index a0c265c2fa..f3e38c2d19 100644 --- a/core/2d/CCFontAtlas.cpp +++ b/core/2d/CCFontAtlas.cpp @@ -27,7 +27,6 @@ #include "2d/CCFontAtlas.h" #if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32 && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID -# include #elif CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID # include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #endif @@ -125,14 +124,6 @@ FontAtlas::~FontAtlas() releaseTextures(); delete[] _currentPageData; - -#if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32 && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID - if (_iconv) - { - iconv_close(_iconv); - _iconv = nullptr; - } -#endif } void FontAtlas::initTextureWithZeros(Texture2D* texture) diff --git a/core/2d/CCFontAtlas.h b/core/2d/CCFontAtlas.h index c31dd19208..e96ce3be36 100644 --- a/core/2d/CCFontAtlas.h +++ b/core/2d/CCFontAtlas.h @@ -138,7 +138,6 @@ protected: float _lineHeight = 0.f; Font* _font = nullptr; FontFreeType* _fontFreeType = nullptr; - void* _iconv = nullptr; // Dynamic GlyphCollection related stuff int _currentPage = 0;