Few bugs discovered by build on recent Clang and few logical bugs discovered before

Author: solodon4

cocos/2d/CCFontAtlas.cpp

@@ -129,7 +129,7 @@ FontAtlas::~FontAtlas()
 #if CC_TARGET_PLATFORM != CC_PLATFORM_WIN32 && CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID
     if (_iconv)
     {
-        iconv_close(_iconv);
+        iconv_close((iconv_t)_iconv);
         _iconv = nullptr;
     }
 #endif
@@ -262,7 +262,7 @@ void FontAtlas::conversionU32TOGB2312(const std::u32string& u32Text, std::unorde
             size_t inLen = strLen * 2;
             size_t outLen = gb2312StrSize;
 
-            iconv(_iconv, (char**)&pin, &inLen, &pout, &outLen);
+            iconv((iconv_t)_iconv, (char**)&pin, &inLen, &pout, &outLen);
         }
 #endif
     }

cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java

@@ -468,7 +468,7 @@ public static int getIntegerForKey(String key, int defaultValue) {
             Map allValues = settings.getAll();
             Object value = allValues.get(key);
             if ( value instanceof String) {
-                return  Integer.parseInt(value.toString());
+                try { return Integer.parseInt(value.toString()); } catch (Exception e) { return 0; }
             }
             else if (value instanceof Float)
             {
@@ -496,7 +496,7 @@ public static float getFloatForKey(String key, float defaultValue) {
             Map allValues = settings.getAll();
             Object value = allValues.get(key);
             if ( value instanceof String) {
-                return  Float.parseFloat(value.toString());
+                try { return Float.parseFloat(value.toString()); } catch (Exception e) { return 0.0f; }
             }
             else if (value instanceof Integer)
             {

cocos/renderer/CCTexture2D.cpp

@@ -151,7 +151,7 @@ Texture2D::~Texture2D()
 #endif
     CC_SAFE_RELEASE_NULL(_alphaTexture); // ETC1 ALPHA support.
 
-    CCLOGINFO("deallocing Texture2D: %p - id=%u", this, _name);
+    CCLOGINFO("deallocing Texture2D: %p - id=%u", this, /*_name*/0);
 
     CC_SAFE_DELETE(_ninePatchInfo);
 

cocos/ui/UILayoutManager.cpp

@@ -59,6 +59,7 @@ void LinearHorizontalLayoutManager::doLayout(LayoutProtocol* layout)
                 LinearLayoutParameter::LinearGravity childGravity = layoutParameter->getGravity();
                 Vec2 ap = child->getAnchorPoint();
                 Size cs = child->getBoundingBox().size;
+                Margin mg = layoutParameter->getMargin();
                 float finalPosX = leftBoundary + (ap.x * cs.width);
                 float finalPosY = layoutSize.height - (1.0f - ap.y) * cs.height;
                 switch (childGravity)
@@ -67,15 +68,14 @@ void LinearHorizontalLayoutManager::doLayout(LayoutProtocol* layout)
                     case LinearLayoutParameter::LinearGravity::TOP:
                         break;
                     case LinearLayoutParameter::LinearGravity::BOTTOM:
-                        finalPosY = ap.y * cs.height;
+                        finalPosY = ap.y * cs.height + mg.top; // Add top margin to counter having it subtracted below from finalPosY
                         break;
                     case LinearLayoutParameter::LinearGravity::CENTER_VERTICAL:
-                        finalPosY = layoutSize.height / 2.0f - cs.height * (0.5f - ap.y);
+                        finalPosY = layoutSize.height / 2.0f - cs.height * (0.5f - ap.y) + mg.top; // Add top margin to counter having it subtracted below from finalPosY
                         break;
                     default:
                         break;
                 }
-                Margin mg = layoutParameter->getMargin();
                 finalPosX += mg.left;
                 finalPosY -= mg.top;
                 child->setPosition(Vec2(finalPosX, finalPosY));
@@ -117,6 +117,7 @@ void LinearVerticalLayoutManager::doLayout(LayoutProtocol* layout)
                 LinearLayoutParameter::LinearGravity childGravity = layoutParameter->getGravity();
                 Vec2 ap = subWidget->getAnchorPoint();
                 Size cs = subWidget->getBoundingBox().size;
+                Margin mg = layoutParameter->getMargin();
                 float finalPosX = ap.x * cs.width;
                 float finalPosY = topBoundary - ((1.0f-ap.y) * cs.height);
                 switch (childGravity)
@@ -125,15 +126,14 @@ void LinearVerticalLayoutManager::doLayout(LayoutProtocol* layout)
                     case LinearLayoutParameter::LinearGravity::LEFT:
                         break;
                     case LinearLayoutParameter::LinearGravity::RIGHT:
-                        finalPosX = layoutSize.width - ((1.0f - ap.x) * cs.width);
+                        finalPosX = layoutSize.width - ((1.0f - ap.x) * cs.width) - mg.left; // Subtract left margin to counter having it added below to finalPosX
                         break;
                     case LinearLayoutParameter::LinearGravity::CENTER_HORIZONTAL:
-                        finalPosX = layoutSize.width / 2.0f - cs.width * (0.5f-ap.x);
+                        finalPosX = layoutSize.width / 2.0f - cs.width * (0.5f-ap.x) - mg.left; // Subtract left margin to counter having it added below to finalPosX
                         break;
                     default:
                         break;
                 }
-                Margin mg = layoutParameter->getMargin();
                 finalPosX += mg.left;
                 finalPosY -= mg.top;
                 subWidget->setPosition(finalPosX, finalPosY);

cocos/ui/UIScrollView.cpp

@@ -233,7 +233,7 @@ void ScrollView::setInnerContainerPosition(const Vec2 &position)
     // Process bouncing events
     if(_bounceEnabled)
     {
-        for(int direction = (int) MoveDirection::TOP; direction < (int) MoveDirection::RIGHT; ++direction)
+        for(int direction = (int) MoveDirection::TOP; direction <= (int) MoveDirection::RIGHT; ++direction)
         {
             if(isOutOfBoundary((MoveDirection) direction))
             {