fix FontAtlas crash on some Android devices #18145
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dumganhar
reviewed
Aug 14, 2017
| @@ -111,6 +111,8 @@ class CC_DLL FontAtlas : public Ref | |||
| protected: | |||
| void reset(); | |||
|
|
|||
| void reinit(); | |||
|
i think it was mistake |
minggo
reviewed
Aug 16, 2017
| @@ -132,6 +146,8 @@ void FontAtlas::reset() | |||
| _currentPageOrigX = 0; | |||
| _currentPageOrigY = 0; | |||
| _letterDefinitions.clear(); | |||
|
|
|||
| reinit(); | |||
There was a problem hiding this comment.
Why need to reinit when it is destroyed.
There was a problem hiding this comment.
may be its wrong and this code is not needed
There was a problem hiding this comment.
if it is not needed, then there is not difference from previous codes.
There was a problem hiding this comment.
Oh, it is my fault, it is added in reset. The github diff doesn't look good.
newnon
commented
Aug 16, 2017
| @@ -132,6 +146,8 @@ void FontAtlas::reset() | |||
| _currentPageOrigX = 0; | |||
| _currentPageOrigY = 0; | |||
| _letterDefinitions.clear(); | |||
|
|
|||
| reinit(); | |||
There was a problem hiding this comment.
may be its wrong and this code is not needed
This was referenced Aug 16, 2017
stevetranby
added a commit
to stevetranby/cocos2d-x
that referenced
this pull request
Aug 23, 2017
* commit 'e79f21cec02ebbffbf08150708ed26e524c1faf2': add new CMakeLists.txt to cpp-template-default (https://gist.github.com/MrCapone/ccdc1826cb7362086107e8096bfe6f90) (cocos2d#18167) Fixes compilation errors for android audio module while building with x86 arch. (cocos2d#18150) fixed GLViewImpl::getMonitorSize() for desktop platforms (cocos2d#18141) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#18183) Fix android problem (cocos2d#18142) fix for ios audio engine (cocos2d#18146) fix android problem with 24 bit depth buffer on some devices (cocos2d#18148) Blend function for UIImageView (cocos2d#18149) Fix alpha blending during the animation of TransitionCrossFade. (cocos2d#18175) fixed cocos2d#17989: touch stops responding on android devices. (cocos2d#18165) [ci skip]update version and readme (cocos2d#18169) fix FontAtlas crash on some Android devices (cocos2d#18145) Add game-controller-test for win32 (cocos2d#18164) Fix android compile fail bug (cocos2d#18166) # Conflicts: # cocos/audio/android/cutils/bitops.h # cocos/audio/apple/AudioEngine-inl.mm
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #17390