Skip to content

Commit 36d4c72

Browse files
author
minggo
committed
Merge pull request #386 from natural-law/master
Resolve crash on ios
2 parents 0f2201e + 4177834 commit 36d4c72

File tree

4 files changed

+57
-5
lines changed

4 files changed

+57
-5
lines changed

‎tests/Res/Default.png renamed to ‎tests/Res/Hello.png

File renamed without changes.

‎tests/test.ios/test.xcodeproj/project.pbxproj

+52
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,19 @@
263263
BF340BEE133B26A70035A4D1 /* PerformanceTextureTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF340BE5133B26A70035A4D1 /* PerformanceTextureTest.cpp */; };
264264
BF340BEF133B26A70035A4D1 /* PerformanceTouchesTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF340BE7133B26A70035A4D1 /* PerformanceTouchesTest.cpp */; };
265265
BF340BF0133B26A70035A4D1 /* PerformanceNodeChildrenTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF340BE9133B26A70035A4D1 /* PerformanceNodeChildrenTest.cpp */; };
266+
BF36580813CC31BC0007A416 /* bug886.jpg in Resources */ = {isa = PBXBuildFile; fileRef = BF3657FC13CC31BC0007A416 /* bug886.jpg */; };
267+
BF36580913CC31BC0007A416 /* bug886.png in Resources */ = {isa = PBXBuildFile; fileRef = BF3657FD13CC31BC0007A416 /* bug886.png */; };
268+
BF36580A13CC31BC0007A416 /* circle-hd.plist in Resources */ = {isa = PBXBuildFile; fileRef = BF3657FE13CC31BC0007A416 /* circle-hd.plist */; };
269+
BF36580B13CC31BC0007A416 /* circle-hd.png in Resources */ = {isa = PBXBuildFile; fileRef = BF3657FF13CC31BC0007A416 /* circle-hd.png */; };
270+
BF36580C13CC31BC0007A416 /* circle.plist in Resources */ = {isa = PBXBuildFile; fileRef = BF36580013CC31BC0007A416 /* circle.plist */; };
271+
BF36580D13CC31BC0007A416 /* circle.png in Resources */ = {isa = PBXBuildFile; fileRef = BF36580113CC31BC0007A416 /* circle.png */; };
272+
BF36580E13CC31BC0007A416 /* corner.png in Resources */ = {isa = PBXBuildFile; fileRef = BF36580213CC31BC0007A416 /* corner.png */; };
273+
BF36580F13CC31BC0007A416 /* edge.png in Resources */ = {isa = PBXBuildFile; fileRef = BF36580313CC31BC0007A416 /* edge.png */; };
274+
BF36581013CC31BC0007A416 /* fill.png in Resources */ = {isa = PBXBuildFile; fileRef = BF36580413CC31BC0007A416 /* fill.png */; };
275+
BF36581113CC31BC0007A416 /* picture-hd.png in Resources */ = {isa = PBXBuildFile; fileRef = BF36580513CC31BC0007A416 /* picture-hd.png */; };
276+
BF36581213CC31BC0007A416 /* picture.png in Resources */ = {isa = PBXBuildFile; fileRef = BF36580613CC31BC0007A416 /* picture.png */; };
277+
BF36581313CC31BC0007A416 /* RetinaDisplay.jpg in Resources */ = {isa = PBXBuildFile; fileRef = BF36580713CC31BC0007A416 /* RetinaDisplay.jpg */; };
278+
BF36582613CC332B0007A416 /* Hello.png in Resources */ = {isa = PBXBuildFile; fileRef = BF36582513CC332B0007A416 /* Hello.png */; };
266279
BF3E8C77135C0B39001AE294 /* CurlTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF3E8C76135C0B39001AE294 /* CurlTest.cpp */; };
267280
BF835B2A13276C7900F3C033 /* CCAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF83588A13276C7700F3C033 /* CCAction.cpp */; };
268281
BF835B2B13276C7900F3C033 /* CCActionCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF83588B13276C7700F3C033 /* CCActionCamera.cpp */; };
@@ -870,6 +883,19 @@
870883
BF340BE8133B26A70035A4D1 /* PerformanceTouchesTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceTouchesTest.h; sourceTree = "<group>"; };
871884
BF340BE9133B26A70035A4D1 /* PerformanceNodeChildrenTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceNodeChildrenTest.cpp; sourceTree = "<group>"; };
872885
BF340BEA133B26A70035A4D1 /* PerformanceNodeChildrenTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceNodeChildrenTest.h; sourceTree = "<group>"; };
886+
BF3657FC13CC31BC0007A416 /* bug886.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = bug886.jpg; path = ../Res/Images/bugs/bug886.jpg; sourceTree = SOURCE_ROOT; };
887+
BF3657FD13CC31BC0007A416 /* bug886.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bug886.png; path = ../Res/Images/bugs/bug886.png; sourceTree = SOURCE_ROOT; };
888+
BF3657FE13CC31BC0007A416 /* circle-hd.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "circle-hd.plist"; path = "../Res/Images/bugs/circle-hd.plist"; sourceTree = SOURCE_ROOT; };
889+
BF3657FF13CC31BC0007A416 /* circle-hd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "circle-hd.png"; path = "../Res/Images/bugs/circle-hd.png"; sourceTree = SOURCE_ROOT; };
890+
BF36580013CC31BC0007A416 /* circle.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = circle.plist; path = ../Res/Images/bugs/circle.plist; sourceTree = SOURCE_ROOT; };
891+
BF36580113CC31BC0007A416 /* circle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = circle.png; path = ../Res/Images/bugs/circle.png; sourceTree = SOURCE_ROOT; };
892+
BF36580213CC31BC0007A416 /* corner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = corner.png; path = ../Res/Images/bugs/corner.png; sourceTree = SOURCE_ROOT; };
893+
BF36580313CC31BC0007A416 /* edge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = edge.png; path = ../Res/Images/bugs/edge.png; sourceTree = SOURCE_ROOT; };
894+
BF36580413CC31BC0007A416 /* fill.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fill.png; path = ../Res/Images/bugs/fill.png; sourceTree = SOURCE_ROOT; };
895+
BF36580513CC31BC0007A416 /* picture-hd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "picture-hd.png"; path = "../Res/Images/bugs/picture-hd.png"; sourceTree = SOURCE_ROOT; };
896+
BF36580613CC31BC0007A416 /* picture.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = picture.png; path = ../Res/Images/bugs/picture.png; sourceTree = SOURCE_ROOT; };
897+
BF36580713CC31BC0007A416 /* RetinaDisplay.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = RetinaDisplay.jpg; path = ../Res/Images/bugs/RetinaDisplay.jpg; sourceTree = SOURCE_ROOT; };
898+
BF36582513CC332B0007A416 /* Hello.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Hello.png; path = ../Res/Hello.png; sourceTree = SOURCE_ROOT; };
873899
BF3E8C75135C0B39001AE294 /* CurlTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurlTest.h; sourceTree = "<group>"; };
874900
BF3E8C76135C0B39001AE294 /* CurlTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CurlTest.cpp; sourceTree = "<group>"; };
875901
BF83588A13276C7700F3C033 /* CCAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAction.cpp; sourceTree = "<group>"; };
@@ -1183,6 +1209,18 @@
11831209
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
11841210
isa = PBXGroup;
11851211
children = (
1212+
BF3657FC13CC31BC0007A416 /* bug886.jpg */,
1213+
BF3657FD13CC31BC0007A416 /* bug886.png */,
1214+
BF3657FE13CC31BC0007A416 /* circle-hd.plist */,
1215+
BF3657FF13CC31BC0007A416 /* circle-hd.png */,
1216+
BF36580013CC31BC0007A416 /* circle.plist */,
1217+
BF36580113CC31BC0007A416 /* circle.png */,
1218+
BF36580213CC31BC0007A416 /* corner.png */,
1219+
BF36580313CC31BC0007A416 /* edge.png */,
1220+
BF36580413CC31BC0007A416 /* fill.png */,
1221+
BF36580513CC31BC0007A416 /* picture-hd.png */,
1222+
BF36580613CC31BC0007A416 /* picture.png */,
1223+
BF36580713CC31BC0007A416 /* RetinaDisplay.jpg */,
11861224
BF83588813276C7700F3C033 /* cocos2dx */,
11871225
080E96DDFE201D6D7F000001 /* ios */,
11881226
BF31DF1312E979A100D4F513 /* tests */,
@@ -1459,6 +1497,7 @@
14591497
BF1B1A7512951B5800E99D96 /* Resources */ = {
14601498
isa = PBXGroup;
14611499
children = (
1500+
BF36582513CC332B0007A416 /* Hello.png */,
14621501
D4E39D2D1342E22700EBA039 /* zwoptex */,
14631502
BF31DE9812E9779300D4F513 /* background.mp3 */,
14641503
BF31DE9912E9779300D4F513 /* effect1.wav */,
@@ -2792,6 +2831,19 @@
27922831
BF31DE9A12E9779300D4F513 /* background.mp3 in Resources */,
27932832
BF31DE9B12E9779300D4F513 /* effect1.wav in Resources */,
27942833
D4E39D2E1342E22700EBA039 /* zwoptex in Resources */,
2834+
BF36580813CC31BC0007A416 /* bug886.jpg in Resources */,
2835+
BF36580913CC31BC0007A416 /* bug886.png in Resources */,
2836+
BF36580A13CC31BC0007A416 /* circle-hd.plist in Resources */,
2837+
BF36580B13CC31BC0007A416 /* circle-hd.png in Resources */,
2838+
BF36580C13CC31BC0007A416 /* circle.plist in Resources */,
2839+
BF36580D13CC31BC0007A416 /* circle.png in Resources */,
2840+
BF36580E13CC31BC0007A416 /* corner.png in Resources */,
2841+
BF36580F13CC31BC0007A416 /* edge.png in Resources */,
2842+
BF36581013CC31BC0007A416 /* fill.png in Resources */,
2843+
BF36581113CC31BC0007A416 /* picture-hd.png in Resources */,
2844+
BF36581213CC31BC0007A416 /* picture.png in Resources */,
2845+
BF36581313CC31BC0007A416 /* RetinaDisplay.jpg in Resources */,
2846+
BF36582613CC332B0007A416 /* Hello.png in Resources */,
27952847
);
27962848
runOnlyForDeploymentPostprocessing = 0;
27972849
};

‎tests/tests/BugsTest/Bug-350.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bool Bug350Layer::init()
1010
if (BugsTestBaseLayer::init())
1111
{
1212
CCSize size = CCDirector::sharedDirector()->getWinSize();
13-
CCSprite *background = CCSprite::spriteWithFile("Default.png");
13+
CCSprite *background = CCSprite::spriteWithFile("Hello.png");
1414
background->setPosition(ccp(size.width/2, size.height/2));
1515
addChild(background);
1616
return true;

‎tests/tests/TileMapTest/TileMapTest.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ TMXGIDObjectsTest::TMXGIDObjectsTest()
13981398
CCLOG("Contentsize: %f, %f", s.width, s.height);
13991399

14001400
CCLOG("----> Iterating over all the group objets");
1401-
CCTMXObjectGroup *group = map->objectGroupNamed("Object Layer 1");
1401+
//CCTMXObjectGroup *group = map->objectGroupNamed("Object Layer 1");
14021402

14031403
}
14041404

@@ -1432,9 +1432,9 @@ void TMXGIDObjectsTest::draw()
14321432

14331433
ccDrawLine(ccp(x, y), ccp(x + width, y));
14341434
ccDrawLine(ccp(x + width, y), ccp(x + width, y + height));
1435-
ccDrawLine(ccp(x + width,y + height), ccp(x,y + height));
1436-
ccDrawLine(ccp(x,y + height), ccp(x,y));
1437-
1435+
ccDrawLine(ccp(x + width,y + height), ccp(x,y + height));
1436+
ccDrawLine(ccp(x,y + height), ccp(x,y));
1437+
14381438
glLineWidth(1);
14391439
}
14401440
}

0 commit comments

Comments
 (0)