Merge pull request cocos2d#1899 from VisualSJ/develop-cocosudio

Issue #4986: May exceed the maximum margin of rect

Author: dingpinglv

cocos2d/core/sprites/CCSprite.js

@@ -1309,8 +1309,12 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
 
         if(texture) {
             var _x = rect.x + rect.width, _y = rect.y + rect.height;
-            cc.assert(_x <= texture.width, cc._LogInfos.RectWidth, texture.url);
-            cc.assert(_y <= texture.height, cc._LogInfos.RectHeight, texture.url);
+            if(_x > texture.width){
+                cc.error(cc._LogInfos.RectWidth, texture.url);
+            }
+            if(_y > texture.height){
+                cc.error(cc._LogInfos.RectHeight, texture.url);
+            }
         }
         _t._originalTexture = texture;
         _t.texture = texture;

cocos2d/core/sprites/CCSpriteFrame.js

@@ -364,8 +364,12 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{
                 _x = rect.x + rect.width;
                 _y = rect.y + rect.height;
             }
-            cc.assert(_x <= texture.width, cc._LogInfos.RectWidth, texture.url);
-            cc.assert(_y <= texture.height, cc._LogInfos.RectHeight, texture.url);
+            if(_x > texture.width){
+                cc.error(cc._LogInfos.RectWidth, texture.url);
+            }
+            if(_y > texture.height){
+                cc.error(cc._LogInfos.RectHeight, texture.url);
+            }
         }
 
         this._rectInPixels = rect;

cocos2d/core/sprites/SpritesWebGL.js

@@ -184,8 +184,12 @@ cc._tmp.WebGLSprite = function () {
                 _x = rect.x + rect.width;
                 _y = rect.y + rect.height;
             }
-            cc.assert(_x <= texture.width, cc._LogInfos.RectWidth, texture.url);
-            cc.assert(_y <= texture.height, cc._LogInfos.RectHeight, texture.url);
+            if(_x > texture.width){
+                cc.error(cc._LogInfos.RectWidth, texture.url);
+            }
+            if(_y > texture.height){
+                cc.error(cc._LogInfos.RectHeight, texture.url);
+            }
         }
 
         _t.texture = texture;