diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-04-07 09:08:02 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2016-04-07 09:08:02 -0400 |
commit | d0c55f1c0d3044085251f60c78854e25365ae6ea (patch) | |
tree | f42a886554e6f3894029617eeb8da1b23e2e8491 /Foundation/GTMGeometryUtilsTest.m | |
parent | 1dc2f31a665871ba5889c121ce2fbe24174f297d (diff) |
Fix GTMGeometry builds on 64 bit OS X where CG and NS struct sizes may differ.
Remove GTMCGPointToNSPoint, GTMNSPointToCGPoint, GTMCGRectToNSRect, GTMCGSizeToNSSize
Note that Apple's NSGeometry.h sometimes defines
NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
so there's some reason to believe the CG and NS structs can compile incompatibly.
Fix a typo in GTMSenTestCase.h
Diffstat (limited to 'Foundation/GTMGeometryUtilsTest.m')
-rw-r--r-- | Foundation/GTMGeometryUtilsTest.m | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/Foundation/GTMGeometryUtilsTest.m b/Foundation/GTMGeometryUtilsTest.m index 38b86fb..f765526 100644 --- a/Foundation/GTMGeometryUtilsTest.m +++ b/Foundation/GTMGeometryUtilsTest.m @@ -25,36 +25,12 @@ @implementation GTMGeometryUtilsTest #if !GTM_IPHONE_SDK -- (void)testGTMCGPointToNSPoint { - CGPoint cgPoint = CGPointMake(15.1,6.2); - NSPoint nsPoint = GTMCGPointToNSPoint(cgPoint); - STAssertTrue(CGPointEqualToPoint(*(CGPoint*)&nsPoint, cgPoint), nil); -} - -- (void)testGTMNSPointToCGPoint { - NSPoint nsPoint = NSMakePoint(10.2,1.5); - CGPoint cgPoint = GTMNSPointToCGPoint(nsPoint); - STAssertTrue(CGPointEqualToPoint(cgPoint, *(CGPoint*)&nsPoint), nil); -} - -- (void)testGTMCGRectToNSRect { - CGRect cgRect = CGRectMake(1.5,2.4,10.6,11.7); - NSRect nsRect = GTMCGRectToNSRect(cgRect); - STAssertTrue(CGRectEqualToRect(cgRect, *(CGRect*)&nsRect), nil); -} - - (void)testGTMNSRectToCGRect { NSRect nsRect = NSMakeRect(4.6,3.2,22.1,45.0); CGRect cgRect = GTMNSRectToCGRect(nsRect); STAssertTrue(CGRectEqualToRect(cgRect, *(CGRect*)&nsRect), nil); } -- (void)testGTMCGSizeToNSSize { - CGSize cgSize = {5,6}; - NSSize nsSize = GTMCGSizeToNSSize(cgSize); - STAssertTrue(CGSizeEqualToSize(cgSize, *(CGSize*)&nsSize), nil); -} - - (void)testGTMNSSizeToCGSize { NSSize nsSize = {22,15}; CGSize cgSize = GTMNSSizeToCGSize(nsSize); |