Merge branch 'initMethods'

mweisman · Sep 1, 2010 · 8844143 · 8844143
2 parents faf2056 + 5fae0ea
commit 8844143
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 82 deletions.
diff --git a/Demo App/ShapeKit.xcodeproj/project.pbxproj b/Demo App/ShapeKit.xcodeproj/project.pbxproj
@@ -231,6 +231,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ShapeKit_Prefix.pch;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = "$(HOME)/$(SDK_DIR)/include";
 				INFOPLIST_FILE = "ShapeKit-Info.plist";
 				LIBRARY_SEARCH_PATHS = "$(HOME)/$(SDK_DIR)/lib";
@@ -246,6 +247,7 @@
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = ShapeKit_Prefix.pch;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = "$(HOME)/$(SDK_DIR)/include";
 				INFOPLIST_FILE = "ShapeKit-Info.plist";
 				LIBRARY_SEARCH_PATHS = "$(HOME)/$(SDK_DIR)/lib";

diff --git a/ShapeKit/ShapeKitGeometry+Predicates.m b/ShapeKit/ShapeKitGeometry+Predicates.m
@@ -14,48 +14,48 @@
 @implementation ShapeKitGeometry (predicates)
 
 -(BOOL)isDisjointFromGeometry:(ShapeKitGeometry *)compareGeometry {
-    BOOL disjoint = GEOSDisjoint(geosGeom, compareGeometry.geosGeom);
+    BOOL disjoint = GEOSDisjoint_r(handle, geosGeom, compareGeometry.geosGeom);
     return disjoint;
 }
 
 -(BOOL)touchesGeometry:(ShapeKitGeometry *)compareGeometry {
-    BOOL touches = GEOSTouches(geosGeom, compareGeometry.geosGeom);
+    BOOL touches = GEOSTouches_r(handle, geosGeom, compareGeometry.geosGeom);
     return touches;
 }
 
 -(BOOL)intersectsGeometry:(ShapeKitGeometry *)compareGeometry {
-    BOOL intersects = GEOSIntersects(geosGeom, compareGeometry.geosGeom);
+    BOOL intersects = GEOSIntersects_r(handle, geosGeom, compareGeometry.geosGeom);
     return intersects;
 }
 
 -(BOOL)crossesGeometry:(ShapeKitGeometry *)compareGeometry {
-    BOOL crosses = GEOSCrosses(geosGeom, compareGeometry.geosGeom);
+    BOOL crosses = GEOSCrosses_r(handle, geosGeom, compareGeometry.geosGeom);
     return crosses;
 }
 
 -(BOOL)isWithinGeometry:(ShapeKitGeometry *)compareGeometry {
-    BOOL within = GEOSWithin(geosGeom, compareGeometry.geosGeom);
+    BOOL within = GEOSWithin_r(handle, geosGeom, compareGeometry.geosGeom);
     return within;
 }
 
 -(BOOL)containsGeometry:(ShapeKitGeometry *)compareGeometry {
-    BOOL contains = GEOSContains(geosGeom, compareGeometry.geosGeom);
+    BOOL contains = GEOSContains_r(handle, geosGeom, compareGeometry.geosGeom);
     return contains;
 }
 
 -(BOOL)overlapsGeometry:(ShapeKitGeometry *)compareGeometry {
-    BOOL overlaps = GEOSOverlaps(geosGeom, compareGeometry.geosGeom);
+    BOOL overlaps = GEOSOverlaps_r(handle, geosGeom, compareGeometry.geosGeom);
     return overlaps;
 }
 
 -(BOOL)isEqualToGeometry:(ShapeKitGeometry *)compareGeometry {
-    BOOL equals = GEOSEquals(geosGeom, compareGeometry.geosGeom);
+    BOOL equals = GEOSEquals_r(handle, geosGeom, compareGeometry.geosGeom);
     return equals;
 }
 
 
 -(BOOL)isRelatedToGeometry:(ShapeKitGeometry *)compareGeometry WithRelatePattern:(NSString *)pattern {
-    BOOL patt_success = GEOSRelatePattern(geosGeom, compareGeometry.geosGeom, [pattern UTF8String]);
+    BOOL patt_success = GEOSRelatePattern_r(handle, geosGeom, compareGeometry.geosGeom, [pattern UTF8String]);
     return patt_success;
 }
 

diff --git a/ShapeKit/ShapeKitGeometry+Topology.m b/ShapeKit/ShapeKitGeometry+Topology.m
@@ -10,31 +10,31 @@
 //
 #import "ShapeKitGeometry+Topology.h"
 
-
 @implementation ShapeKitGeometry (Topology)
 
 -(ShapeKitPolygon *)envelope {
-    return [[[ShapeKitPolygon alloc] initWithGeosGeometry:GEOSEnvelope(geosGeom)] autorelease];
+//    return [[[ShapeKitPolygon alloc] initWithGeosGeometry:GEOSEnvelope_r(handle, geosGeom) GEOSContextHandle:ghandle] autorelease];
+    return [[[ShapeKitPolygon alloc] initWithGeosGeometry:GEOSEnvelope_r(handle, geosGeom)] autorelease];
 }
 
 -(ShapeKitPolygon *)bufferWithWidth:(double)width {
-    return [[[ShapeKitPolygon alloc] initWithGeosGeometry:GEOSBuffer(geosGeom, width, 0)] autorelease];
+    return [[[ShapeKitPolygon alloc] initWithGeosGeometry:GEOSBuffer_r(handle, geosGeom, width, 0)] autorelease];
 }
 
 -(ShapeKitPolygon *)convexHull {
-    return [[[ShapeKitPolygon alloc] initWithGeosGeometry:GEOSConvexHull(geosGeom)] autorelease];
+    return [[[ShapeKitPolygon alloc] initWithGeosGeometry:GEOSConvexHull_r(handle, geosGeom)] autorelease];
 }
 
 -(NSString *)relationshipWithGeometry:(ShapeKitGeometry *)geometry {
-    return [NSString stringWithUTF8String:GEOSRelate(geosGeom, geometry.geosGeom)];
+    return [NSString stringWithUTF8String:GEOSRelate_r(handle, geosGeom, geometry.geosGeom)];
 }
 
 -(ShapeKitPoint *)centroid {
-    return [[[ShapeKitPoint alloc] initWithGeosGeometry:GEOSGetCentroid(geosGeom)] autorelease];
+    return [[[ShapeKitPoint alloc] initWithGeosGeometry:GEOSGetCentroid_r(handle, geosGeom)] autorelease];
 }
 
 -(ShapeKitPoint *)pointOnSurface {
-    return [[[ShapeKitPoint alloc] initWithGeosGeometry:GEOSPointOnSurface(geosGeom)] autorelease];
+    return [[[ShapeKitPoint alloc] initWithGeosGeometry:GEOSPointOnSurface_r(handle, geosGeom)] autorelease];
 }
 
 @end
diff --git a/ShapeKit/ShapeKitGeometry.h b/ShapeKit/ShapeKitGeometry.h
@@ -19,6 +19,7 @@
     NSString *wktGeom;
     NSString *geomType;
     GEOSGeometry *geosGeom;
+    GEOSContextHandle_t handle;
 }
 
 @property (nonatomic,retain) NSString *wktGeom;