Menu
▾
▴
SF.net SVN: matplotlib: [4259] trunk/toolkits/basemap-testing
|
From: <js...@us...> - 2007-11-13 23:03:00
|
Revision: 4259
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4259&view=rev
Author: jswhit
Date: 2007-11-13 15:02:59 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
more fixes for pickling
Modified Paths:
--------------
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
trunk/toolkits/basemap-testing/src/_geos.c
trunk/toolkits/basemap-testing/src/_geos.pyx
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py 2007-11-13 22:26:02 UTC (rev 4258)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py 2007-11-13 23:02:59 UTC (rev 4259)
@@ -772,7 +772,7 @@
maptran = pyproj.Proj(proj='stere',lon_0=lon_0,lat_0=lat_0)
# boundary polygon for orthographic projection
# in stereographic coorindates.
- b = self._boundarypolyll.get_coords()
+ b = self._boundarypolyll.boundary
blons = b[:,0]; blats = b[:,1]
b[:,0], b[:,1] = maptran(blons, blats)
boundarypolyxy = _geos.Polygon(b)
@@ -854,7 +854,7 @@
# which have a 'boundary' attribute.
# otherwise, use 'coords' attribute
# to extract coordinates.
- b = psub.get_coords()
+ b = psub.boundary
blons = b[:,0]; blats = b[:,1]
# transformation from lat/lon to
# map projection coordinates.
@@ -904,7 +904,7 @@
pass
# iterate over geometries in intersection.
for psub in geoms:
- b = psub.get_coords()
+ b = psub.boundary
# if projection == 'ortho',
# transform polygon from stereographic
# to orthographic coordinates.
Modified: trunk/toolkits/basemap-testing/src/_geos.c
===================================================================
--- trunk/toolkits/basemap-testing/src/_geos.c 2007-11-13 22:26:02 UTC (rev 4258)
+++ trunk/toolkits/basemap-testing/src/_geos.c 2007-11-13 23:02:59 UTC (rev 4259)
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.9.6.7 on Tue Nov 13 15:19:22 2007 */
+/* Generated by Cython 0.9.6.7 on Tue Nov 13 16:02:30 2007 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -77,10 +77,10 @@
static void __Pyx_WriteUnraisable(char *name); /*proto*/
-static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
-
static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
+static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
+
static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/
static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
@@ -121,9 +121,6 @@
static PyTypeObject *__pyx_ptype_5_geos_Polygon = 0;
static PyTypeObject *__pyx_ptype_5_geos_LineString = 0;
static PyTypeObject *__pyx_ptype_5_geos_Point = 0;
-static PyArrayObject *__pyx_k4;
-static PyArrayObject *__pyx_k5;
-static PyObject *__pyx_k6;
static void (__pyx_f_5_geos_notice_h(char (*),char (*))); /*proto*/
static void (__pyx_f_5_geos_error_h(char (*),char (*))); /*proto*/
static PyObject *(__pyx_f_5_geos__add_geom(struct __pyx_obj_5_geos_BaseGeometry *,GEOSGeom (*))); /*proto*/
@@ -153,9 +150,9 @@
static PyObject *__pyx_n_stdout;
static PyObject *__pyx_n_write;
-static PyObject *__pyx_k7p;
+static PyObject *__pyx_k4p;
-static char (__pyx_k7[]) = "GEOS_NOTICE: %s\n";
+static char (__pyx_k4[]) = "GEOS_NOTICE: %s\n";
static void __pyx_f_5_geos_notice_h(char (*__pyx_v_fmt),char (*__pyx_v_msg)) {
PyObject *__pyx_v_format;
@@ -255,7 +252,7 @@
Py_DECREF(__pyx_1); __pyx_1 = 0;
__pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_write); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_2 = PyNumber_Remainder(__pyx_k7p, __pyx_v_warn_msg); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; goto __pyx_L1;}
+ __pyx_2 = PyNumber_Remainder(__pyx_k4p, __pyx_v_warn_msg); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; goto __pyx_L1;}
__pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
__pyx_2 = 0;
@@ -278,9 +275,9 @@
static PyObject *__pyx_n_stderr;
-static PyObject *__pyx_k8p;
+static PyObject *__pyx_k5p;
-static char (__pyx_k8[]) = "GEOS_ERROR: %s\n";
+static char (__pyx_k5[]) = "GEOS_ERROR: %s\n";
static void __pyx_f_5_geos_error_h(char (*__pyx_v_fmt),char (*__pyx_v_msg)) {
PyObject *__pyx_v_format;
@@ -380,7 +377,7 @@
Py_DECREF(__pyx_1); __pyx_1 = 0;
__pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_write); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_2 = PyNumber_Remainder(__pyx_k8p, __pyx_v_warn_msg); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; goto __pyx_L1;}
+ __pyx_2 = PyNumber_Remainder(__pyx_k5p, __pyx_v_warn_msg); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; goto __pyx_L1;}
__pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
__pyx_2 = 0;
@@ -664,11 +661,11 @@
static PyObject *__pyx_n_append;
static PyObject *__pyx_n_NotImplementedError;
-static PyObject *__pyx_k9p;
+static PyObject *__pyx_k6p;
static PyObject *__pyx_builtin_NotImplementedError;
-static char (__pyx_k9[]) = "intersections of type '%s' not yet implemented";
+static char (__pyx_k6[]) = "intersections of type '%s' not yet implemented";
static PyObject *__pyx_f_py_5_geos_12BaseGeometry_intersection(PyObject *__pyx_v_self, PyObject *__pyx_v_geom); /*proto*/
static PyObject *__pyx_f_py_5_geos_12BaseGeometry_intersection(PyObject *__pyx_v_self, PyObject *__pyx_v_geom) {
@@ -679,8 +676,10 @@
int __pyx_v_numgeoms;
int __pyx_v_i;
int __pyx_v_typeid;
+ PyObject *__pyx_v_b;
PyObject *__pyx_v_p;
PyObject *__pyx_v_pout;
+ PyObject *__pyx_v_type;
PyObject *__pyx_r;
int __pyx_1;
PyObject *__pyx_2 = 0;
@@ -688,8 +687,10 @@
PyObject *__pyx_4 = 0;
Py_INCREF(__pyx_v_self);
Py_INCREF(__pyx_v_geom);
+ __pyx_v_b = Py_None; Py_INCREF(Py_None);
__pyx_v_p = Py_None; Py_INCREF(Py_None);
__pyx_v_pout = Py_None; Py_INCREF(Py_None);
+ __pyx_v_type = Py_None; Py_INCREF(Py_None);
if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_geom), __pyx_ptype_5_geos_BaseGeometry, 1, "geom"))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; goto __pyx_L1;}
/* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":162
@@ -724,7 +725,7 @@
* g3 = GEOSIntersection(g1, g2)
* typeid = GEOSGeomTypeId(g3) # <<<<<<<<<<<<<<
* if typeid == GEOS_POLYGON:
- * p = Polygon() # create an empty Polygon instance
+ * b = _get_coords(g3)
*/
__pyx_v_typeid = GEOSGeomTypeId(__pyx_v_g3);
@@ -732,8 +733,8 @@
* g3 = GEOSIntersection(g1, g2)
* typeid = GEOSGeomTypeId(g3)
* if typeid == GEOS_POLYGON: # <<<<<<<<<<<<<<
- * p = Polygon() # create an empty Polygon instance
- * p = _add_geom(p,g3) # add geometry to it.
+ * b = _get_coords(g3)
+ * p = Polygon(b)
*/
__pyx_1 = (__pyx_v_typeid == GEOS_POLYGON);
if (__pyx_1) {
@@ -741,36 +742,39 @@
/* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":167
* typeid = GEOSGeomTypeId(g3)
* if typeid == GEOS_POLYGON:
- * p = Polygon() # create an empty Polygon instance # <<<<<<<<<<<<<<
- * p = _add_geom(p,g3) # add geometry to it.
- * # above should be faster than this ..
+ * b = _get_coords(g3) # <<<<<<<<<<<<<<
+ * p = Polygon(b)
+ * pout = [p]
*/
- __pyx_2 = PyObject_CallObject(((PyObject*)__pyx_ptype_5_geos_Polygon), 0); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; goto __pyx_L1;}
- Py_DECREF(__pyx_v_p);
- __pyx_v_p = __pyx_2;
+ __pyx_2 = __pyx_f_5_geos__get_coords(__pyx_v_g3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; goto __pyx_L1;}
+ Py_DECREF(__pyx_v_b);
+ __pyx_v_b = __pyx_2;
__pyx_2 = 0;
/* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":168
* if typeid == GEOS_POLYGON:
- * p = Polygon() # create an empty Polygon instance
- * p = _add_geom(p,g3) # add geometry to it. # <<<<<<<<<<<<<<
- * # above should be faster than this ..
- * #b = _get_coords(g3)
+ * b = _get_coords(g3)
+ * p = Polygon(b) # <<<<<<<<<<<<<<
+ * pout = [p]
+ * elif typeid == GEOS_LINESTRING:
*/
- if (!__Pyx_TypeTest(__pyx_v_p, __pyx_ptype_5_geos_BaseGeometry)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;}
- __pyx_2 = __pyx_f_5_geos__add_geom(((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_p),__pyx_v_g3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;}
+ __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;}
+ Py_INCREF(__pyx_v_b);
+ PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_b);
+ __pyx_3 = PyObject_CallObject(((PyObject*)__pyx_ptype_5_geos_Polygon), __pyx_2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;}
+ Py_DECREF(__pyx_2); __pyx_2 = 0;
Py_DECREF(__pyx_v_p);
- __pyx_v_p = __pyx_2;
- __pyx_2 = 0;
+ __pyx_v_p = __pyx_3;
+ __pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":172
- * #b = _get_coords(g3)
- * #p = Polygon(b)
- * pout = [p] # return a list with a single element # <<<<<<<<<<<<<<
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":169
+ * b = _get_coords(g3)
+ * p = Polygon(b)
+ * pout = [p] # <<<<<<<<<<<<<<
* elif typeid == GEOS_LINESTRING:
- * p = LineString() # create an empty LineString instance
+ * b = _get_coords(g3)
*/
- __pyx_2 = PyList_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; goto __pyx_L1;}
+ __pyx_2 = PyList_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; goto __pyx_L1;}
Py_INCREF(__pyx_v_p);
PyList_SET_ITEM(__pyx_2, 0, __pyx_v_p);
Py_DECREF(__pyx_v_pout);
@@ -781,51 +785,54 @@
__pyx_1 = (__pyx_v_typeid == GEOS_LINESTRING);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":174
- * pout = [p] # return a list with a single element
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":171
+ * pout = [p]
* elif typeid == GEOS_LINESTRING:
- * p = LineString() # create an empty LineString instance # <<<<<<<<<<<<<<
- * p = _add_geom(p,g3) # add geometry to it.
- * return [p]
+ * b = _get_coords(g3) # <<<<<<<<<<<<<<
+ * p = LineString(b)
+ * pout = [p]
*/
- __pyx_2 = PyObject_CallObject(((PyObject*)__pyx_ptype_5_geos_LineString), 0); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; goto __pyx_L1;}
- Py_DECREF(__pyx_v_p);
- __pyx_v_p = __pyx_2;
- __pyx_2 = 0;
+ __pyx_3 = __pyx_f_5_geos__get_coords(__pyx_v_g3); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; goto __pyx_L1;}
+ Py_DECREF(__pyx_v_b);
+ __pyx_v_b = __pyx_3;
+ __pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":175
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":172
* elif typeid == GEOS_LINESTRING:
- * p = LineString() # create an empty LineString instance
- * p = _add_geom(p,g3) # add geometry to it. # <<<<<<<<<<<<<<
- * return [p]
+ * b = _get_coords(g3)
+ * p = LineString(b) # <<<<<<<<<<<<<<
+ * pout = [p]
* elif typeid == GEOS_MULTIPOLYGON:
*/
- if (!__Pyx_TypeTest(__pyx_v_p, __pyx_ptype_5_geos_BaseGeometry)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
- __pyx_2 = __pyx_f_5_geos__add_geom(((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_p),__pyx_v_g3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 175; goto __pyx_L1;}
+ __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; goto __pyx_L1;}
+ Py_INCREF(__pyx_v_b);
+ PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_b);
+ __pyx_3 = PyObject_CallObject(((PyObject*)__pyx_ptype_5_geos_LineString), __pyx_2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; goto __pyx_L1;}
+ Py_DECREF(__pyx_2); __pyx_2 = 0;
Py_DECREF(__pyx_v_p);
- __pyx_v_p = __pyx_2;
- __pyx_2 = 0;
+ __pyx_v_p = __pyx_3;
+ __pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":176
- * p = LineString() # create an empty LineString instance
- * p = _add_geom(p,g3) # add geometry to it.
- * return [p] # <<<<<<<<<<<<<<
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":173
+ * b = _get_coords(g3)
+ * p = LineString(b)
+ * pout = [p] # <<<<<<<<<<<<<<
* elif typeid == GEOS_MULTIPOLYGON:
* numgeoms = GEOSGetNumGeometries(g3)
*/
- __pyx_2 = PyList_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;}
+ __pyx_2 = PyList_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;}
Py_INCREF(__pyx_v_p);
PyList_SET_ITEM(__pyx_2, 0, __pyx_v_p);
- __pyx_r = __pyx_2;
+ Py_DECREF(__pyx_v_pout);
+ __pyx_v_pout = __pyx_2;
__pyx_2 = 0;
- goto __pyx_L0;
goto __pyx_L2;
}
__pyx_1 = (__pyx_v_typeid == GEOS_MULTIPOLYGON);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":178
- * return [p]
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":175
+ * pout = [p]
* elif typeid == GEOS_MULTIPOLYGON:
* numgeoms = GEOSGetNumGeometries(g3) # <<<<<<<<<<<<<<
* pout = []
@@ -833,75 +840,78 @@
*/
__pyx_v_numgeoms = GEOSGetNumGeometries(__pyx_v_g3);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":179
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":176
* elif typeid == GEOS_MULTIPOLYGON:
* numgeoms = GEOSGetNumGeometries(g3)
* pout = [] # <<<<<<<<<<<<<<
* for i from 0 <= i < numgeoms:
* gout = GEOSGetGeometryN(g3, i)
*/
- __pyx_2 = PyList_New(0); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; goto __pyx_L1;}
+ __pyx_3 = PyList_New(0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;}
Py_DECREF(__pyx_v_pout);
- __pyx_v_pout = __pyx_2;
- __pyx_2 = 0;
+ __pyx_v_pout = __pyx_3;
+ __pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":180
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":177
* numgeoms = GEOSGetNumGeometries(g3)
* pout = []
* for i from 0 <= i < numgeoms: # <<<<<<<<<<<<<<
* gout = GEOSGetGeometryN(g3, i)
- * p = Polygon() # create an empty Polygon instance
+ * b = _get_coords(gout)
*/
for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_numgeoms; __pyx_v_i++) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":181
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":178
* pout = []
* for i from 0 <= i < numgeoms:
* gout = GEOSGetGeometryN(g3, i) # <<<<<<<<<<<<<<
- * p = Polygon() # create an empty Polygon instance
- * p = _add_geom(p,gout) # add geometry to it.
+ * b = _get_coords(gout)
+ * p = Polygon(b)
*/
__pyx_v_gout = GEOSGetGeometryN(__pyx_v_g3,__pyx_v_i);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":182
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":179
* for i from 0 <= i < numgeoms:
* gout = GEOSGetGeometryN(g3, i)
- * p = Polygon() # create an empty Polygon instance # <<<<<<<<<<<<<<
- * p = _add_geom(p,gout) # add geometry to it.
+ * b = _get_coords(gout) # <<<<<<<<<<<<<<
+ * p = Polygon(b)
* pout.append(p)
*/
- __pyx_2 = PyObject_CallObject(((PyObject*)__pyx_ptype_5_geos_Polygon), 0); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;}
- Py_DECREF(__pyx_v_p);
- __pyx_v_p = __pyx_2;
+ __pyx_2 = __pyx_f_5_geos__get_coords(__pyx_v_gout); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; goto __pyx_L1;}
+ Py_DECREF(__pyx_v_b);
+ __pyx_v_b = __pyx_2;
__pyx_2 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":183
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":180
* gout = GEOSGetGeometryN(g3, i)
- * p = Polygon() # create an empty Polygon instance
- * p = _add_geom(p,gout) # add geometry to it. # <<<<<<<<<<<<<<
+ * b = _get_coords(gout)
+ * p = Polygon(b) # <<<<<<<<<<<<<<
* pout.append(p)
* elif typeid == GEOS_MULTILINESTRING:
*/
- if (!__Pyx_TypeTest(__pyx_v_p, __pyx_ptype_5_geos_BaseGeometry)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; goto __pyx_L1;}
- __pyx_2 = __pyx_f_5_geos__add_geom(((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_p),__pyx_v_gout); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; goto __pyx_L1;}
+ __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; goto __pyx_L1;}
+ Py_INCREF(__pyx_v_b);
+ PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_b);
+ __pyx_2 = PyObject_CallObject(((PyObject*)__pyx_ptype_5_geos_Polygon), __pyx_3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; goto __pyx_L1;}
+ Py_DECREF(__pyx_3); __pyx_3 = 0;
Py_DECREF(__pyx_v_p);
__pyx_v_p = __pyx_2;
__pyx_2 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":184
- * p = Polygon() # create an empty Polygon instance
- * p = _add_geom(p,gout) # add geometry to it.
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":181
+ * b = _get_coords(gout)
+ * p = Polygon(b)
* pout.append(p) # <<<<<<<<<<<<<<
* elif typeid == GEOS_MULTILINESTRING:
* numgeoms = GEOSGetNumGeometries(g3)
*/
- __pyx_2 = PyObject_GetAttr(__pyx_v_pout, __pyx_n_append); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; goto __pyx_L1;}
- __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; goto __pyx_L1;}
+ __pyx_3 = PyObject_GetAttr(__pyx_v_pout, __pyx_n_append); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; goto __pyx_L1;}
+ __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; goto __pyx_L1;}
Py_INCREF(__pyx_v_p);
- PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_p);
- __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; goto __pyx_L1;}
- Py_DECREF(__pyx_2); __pyx_2 = 0;
+ PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_p);
+ __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
+ Py_DECREF(__pyx_2); __pyx_2 = 0;
Py_DECREF(__pyx_4); __pyx_4 = 0;
}
goto __pyx_L2;
@@ -909,7 +919,7 @@
__pyx_1 = (__pyx_v_typeid == GEOS_MULTILINESTRING);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":186
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":183
* pout.append(p)
* elif typeid == GEOS_MULTILINESTRING:
* numgeoms = GEOSGetNumGeometries(g3) # <<<<<<<<<<<<<<
@@ -918,102 +928,117 @@
*/
__pyx_v_numgeoms = GEOSGetNumGeometries(__pyx_v_g3);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":187
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":184
* elif typeid == GEOS_MULTILINESTRING:
* numgeoms = GEOSGetNumGeometries(g3)
* pout = [] # <<<<<<<<<<<<<<
* for i from 0 <= i < numgeoms:
* gout = GEOSGetGeometryN(g3, i)
*/
- __pyx_2 = PyList_New(0); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 187; goto __pyx_L1;}
+ __pyx_3 = PyList_New(0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; goto __pyx_L1;}
Py_DECREF(__pyx_v_pout);
- __pyx_v_pout = __pyx_2;
- __pyx_2 = 0;
+ __pyx_v_pout = __pyx_3;
+ __pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":188
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":185
* numgeoms = GEOSGetNumGeometries(g3)
* pout = []
* for i from 0 <= i < numgeoms: # <<<<<<<<<<<<<<
* gout = GEOSGetGeometryN(g3, i)
- * p = LineString() # create an LineString instance
+ * b = _get_coords(gout)
*/
for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_numgeoms; __pyx_v_i++) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":189
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":186
* pout = []
* for i from 0 <= i < numgeoms:
* gout = GEOSGetGeometryN(g3, i) # <<<<<<<<<<<<<<
- * p = LineString() # create an LineString instance
- * p = _add_geom(p,gout) # add geometry to it.
+ * b = _get_coords(gout)
+ * p = LineString(b)
*/
__pyx_v_gout = GEOSGetGeometryN(__pyx_v_g3,__pyx_v_i);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":190
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":187
* for i from 0 <= i < numgeoms:
* gout = GEOSGetGeometryN(g3, i)
- * p = LineString() # create an LineString instance # <<<<<<<<<<<<<<
- * p = _add_geom(p,gout) # add geometry to it.
+ * b = _get_coords(gout) # <<<<<<<<<<<<<<
+ * p = LineString(b)
* pout.append(p)
*/
- __pyx_3 = PyObject_CallObject(((PyObject*)__pyx_ptype_5_geos_LineString), 0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; goto __pyx_L1;}
- Py_DECREF(__pyx_v_p);
- __pyx_v_p = __pyx_3;
- __pyx_3 = 0;
+ __pyx_2 = __pyx_f_5_geos__get_coords(__pyx_v_gout); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 187; goto __pyx_L1;}
+ Py_DECREF(__pyx_v_b);
+ __pyx_v_b = __pyx_2;
+ __pyx_2 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":191
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":188
* gout = GEOSGetGeometryN(g3, i)
- * p = LineString() # create an LineString instance
- * p = _add_geom(p,gout) # add geometry to it. # <<<<<<<<<<<<<<
+ * b = _get_coords(gout)
+ * p = LineString(b) # <<<<<<<<<<<<<<
* pout.append(p)
* else:
*/
- if (!__Pyx_TypeTest(__pyx_v_p, __pyx_ptype_5_geos_BaseGeometry)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; goto __pyx_L1;}
- __pyx_4 = __pyx_f_5_geos__add_geom(((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_p),__pyx_v_gout); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; goto __pyx_L1;}
+ __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; goto __pyx_L1;}
+ Py_INCREF(__pyx_v_b);
+ PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_b);
+ __pyx_3 = PyObject_CallObject(((PyObject*)__pyx_ptype_5_geos_LineString), __pyx_4); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; goto __pyx_L1;}
+ Py_DECREF(__pyx_4); __pyx_4 = 0;
Py_DECREF(__pyx_v_p);
- __pyx_v_p = __pyx_4;
- __pyx_4 = 0;
+ __pyx_v_p = __pyx_3;
+ __pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":192
- * p = LineString() # create an LineString instance
- * p = _add_geom(p,gout) # add geometry to it.
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":189
+ * b = _get_coords(gout)
+ * p = LineString(b)
* pout.append(p) # <<<<<<<<<<<<<<
* else:
- * raise NotImplementedError("intersections of type '%s' not yet implemented" % (type))
+ * type = PyString_FromString(GEOSGeomType(g3))
*/
- __pyx_2 = PyObject_GetAttr(__pyx_v_pout, __pyx_n_append); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; goto __pyx_L1;}
- __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; goto __pyx_L1;}
+ __pyx_2 = PyObject_GetAttr(__pyx_v_pout, __pyx_n_append); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 189; goto __pyx_L1;}
+ __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 189; goto __pyx_L1;}
Py_INCREF(__pyx_v_p);
- PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_p);
- __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; goto __pyx_L1;}
+ PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_p);
+ __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 189; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- Py_DECREF(__pyx_3); __pyx_3 = 0;
Py_DECREF(__pyx_4); __pyx_4 = 0;
+ Py_DECREF(__pyx_3); __pyx_3 = 0;
}
goto __pyx_L2;
}
/*else*/ {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":194
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":191
* pout.append(p)
* else:
+ * type = PyString_FromString(GEOSGeomType(g3)) # <<<<<<<<<<<<<<
+ * raise NotImplementedError("intersections of type '%s' not yet implemented" % (type))
+ * return pout
+ */
+ __pyx_2 = PyString_FromString(GEOSGeomType(__pyx_v_g3)); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; goto __pyx_L1;}
+ Py_DECREF(__pyx_v_type);
+ __pyx_v_type = __pyx_2;
+ __pyx_2 = 0;
+
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":192
+ * else:
+ * type = PyString_FromString(GEOSGeomType(g3))
* raise NotImplementedError("intersections of type '%s' not yet implemented" % (type)) # <<<<<<<<<<<<<<
* return pout
*
*/
- __pyx_2 = PyNumber_Remainder(__pyx_k9p, ((PyObject*)&PyType_Type)); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; goto __pyx_L1;}
- __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; goto __pyx_L1;}
- PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
- __pyx_2 = 0;
- __pyx_4 = PyObject_CallObject(__pyx_builtin_NotImplementedError, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; goto __pyx_L1;}
+ __pyx_4 = PyNumber_Remainder(__pyx_k6p, __pyx_v_type); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; goto __pyx_L1;}
+ __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; goto __pyx_L1;}
+ PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
+ __pyx_4 = 0;
+ __pyx_2 = PyObject_CallObject(__pyx_builtin_NotImplementedError, __pyx_3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
- __Pyx_Raise(__pyx_4, 0, 0);
- Py_DECREF(__pyx_4); __pyx_4 = 0;
- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; goto __pyx_L1;}
+ __Pyx_Raise(__pyx_2, 0, 0);
+ Py_DECREF(__pyx_2); __pyx_2 = 0;
+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; goto __pyx_L1;}
}
__pyx_L2:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":195
- * else:
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":193
+ * type = PyString_FromString(GEOSGeomType(g3))
* raise NotImplementedError("intersections of type '%s' not yet implemented" % (type))
* return pout # <<<<<<<<<<<<<<
*
@@ -1032,8 +1057,10 @@
__Pyx_AddTraceback("_geos.BaseGeometry.intersection");
__pyx_r = 0;
__pyx_L0:;
+ Py_DECREF(__pyx_v_b);
Py_DECREF(__pyx_v_p);
Py_DECREF(__pyx_v_pout);
+ Py_DECREF(__pyx_v_type);
Py_DECREF(__pyx_v_self);
Py_DECREF(__pyx_v_geom);
return __pyx_r;
@@ -1045,14 +1072,14 @@
PyObject *__pyx_1 = 0;
Py_INCREF(__pyx_v_self);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":198
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":196
*
* def get_coords(self):
* return _get_coords(self._geom) # <<<<<<<<<<<<<<
*
* def __dealloc__(self):
*/
- __pyx_1 = __pyx_f_5_geos__get_coords(((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_self)->_geom); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 198; goto __pyx_L1;}
+ __pyx_1 = __pyx_f_5_geos__get_coords(((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_self)->_geom); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; goto __pyx_L1;}
__pyx_r = __pyx_1;
__pyx_1 = 0;
goto __pyx_L0;
@@ -1073,7 +1100,7 @@
static void __pyx_f_py_5_geos_12BaseGeometry___dealloc__(PyObject *__pyx_v_self) {
Py_INCREF(__pyx_v_self);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":202
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":200
* def __dealloc__(self):
* """destroy GEOS geometry"""
* GEOSGeom_destroy(self._geom) # <<<<<<<<<<<<<<
@@ -1096,18 +1123,18 @@
PyObject *__pyx_3 = 0;
Py_INCREF(__pyx_v_self);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":206
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":204
* def __reduce__(self):
* """special method that allows geos instance to be pickled"""
* return (self.__class__,(self.boundary,)) # <<<<<<<<<<<<<<
*
* cdef class Polygon(BaseGeometry):
*/
- __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n___class__); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; goto __pyx_L1;}
- __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; goto __pyx_L1;}
+ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n___class__); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; goto __pyx_L1;}
+ __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; goto __pyx_L1;}
Py_INCREF(((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_self)->boundary);
PyTuple_SET_ITEM(__pyx_2, 0, ((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_self)->boundary);
- __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; goto __pyx_L1;}
+ __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
PyTuple_SET_ITEM(__pyx_3, 1, __pyx_2);
__pyx_1 = 0;
@@ -1155,37 +1182,13 @@
unsigned int __pyx_5;
PyObject *__pyx_6 = 0;
static char *__pyx_argnames[] = {"b",0};
- __pyx_v_b = __pyx_k4;
- if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_b))) return -1;
+ if (unlikely(!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_b))) return -1;
Py_INCREF((PyObject *)__pyx_v_self);
Py_INCREF(__pyx_v_b);
- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_b), __pyx_ptype_5_geos_ndarray, 1, "b"))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 210; goto __pyx_L1;}
+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_b), __pyx_ptype_5_geos_ndarray, 1, "b"))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 208; goto __pyx_L1;}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":218
- *
- * # just return an empty class
- * if b is None: # <<<<<<<<<<<<<<
- * return
- *
- */
- __pyx_1 = (((PyObject *)__pyx_v_b) == Py_None);
- if (__pyx_1) {
-
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":219
- * # just return an empty class
- * if b is None:
- * return # <<<<<<<<<<<<<<
- *
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":217
* # make sure data is contiguous.
- */
- __pyx_r = 0;
- goto __pyx_L0;
- goto __pyx_L2;
- }
- __pyx_L2:;
-
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":223
- * # make sure data is contiguous.
* # if not, make a local copy.
* if not PyArray_ISCONTIGUOUS(b): # <<<<<<<<<<<<<<
* b = b.copy()
@@ -1194,96 +1197,96 @@
__pyx_1 = (!PyArray_ISCONTIGUOUS(__pyx_v_b));
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":224
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":218
* # if not, make a local copy.
* if not PyArray_ISCONTIGUOUS(b):
* b = b.copy() # <<<<<<<<<<<<<<
*
* m = b.shape[0]
*/
- __pyx_2 = PyObject_GetAttr(((PyObject *)__pyx_v_b), __pyx_n_copy); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; goto __pyx_L1;}
- __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; goto __pyx_L1;}
+ __pyx_2 = PyObject_GetAttr(((PyObject *)__pyx_v_b), __pyx_n_copy); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 218; goto __pyx_L1;}
+ __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 218; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_5_geos_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; goto __pyx_L1;}
+ if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_5_geos_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 218; goto __pyx_L1;}
Py_DECREF(((PyObject *)__pyx_v_b));
__pyx_v_b = ((PyArrayObject *)__pyx_3);
__pyx_3 = 0;
- goto __pyx_L3;
+ goto __pyx_L2;
}
- __pyx_L3:;
+ __pyx_L2:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":226
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":220
* b = b.copy()
*
* m = b.shape[0] # <<<<<<<<<<<<<<
*
* # Add closing coordinates to sequence?
*/
- __pyx_2 = PyObject_GetAttr(((PyObject *)__pyx_v_b), __pyx_n_shape); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; goto __pyx_L1;}
+ __pyx_2 = PyObject_GetAttr(((PyObject *)__pyx_v_b), __pyx_n_shape); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; goto __pyx_L1;}
if (PyList_CheckExact(__pyx_2) && 0 <= 0 && 0 < PyList_GET_SIZE(__pyx_2)) {
__pyx_4 = PyList_GET_ITEM(__pyx_2, 0); Py_INCREF(__pyx_4);
} else if (PyTuple_CheckExact(__pyx_2) && 0 <= 0 && 0 < PyTuple_GET_SIZE(__pyx_2)) {
__pyx_4 = PyTuple_GET_ITEM(__pyx_2, 0); Py_INCREF(__pyx_4);
} else {
- __pyx_3 = PyInt_FromLong(0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; goto __pyx_L1;}
- __pyx_4 = PyObject_GetItem(__pyx_2, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; goto __pyx_L1;}
+ __pyx_3 = PyInt_FromLong(0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; goto __pyx_L1;}
+ __pyx_4 = PyObject_GetItem(__pyx_2, __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_5 = PyInt_AsUnsignedLongMask(__pyx_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; goto __pyx_L1;}
+ __pyx_5 = PyInt_AsUnsignedLongMask(__pyx_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; goto __pyx_L1;}
Py_DECREF(__pyx_4); __pyx_4 = 0;
__pyx_v_m = __pyx_5;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":229
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":223
*
* # Add closing coordinates to sequence?
* if b[-1,0] != b[0,0] or b[-1,1] != b[0,1]: # <<<<<<<<<<<<<<
* M = m + 1
* else:
*/
- __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_INCREF(__pyx_num_neg_1);
PyTuple_SET_ITEM(__pyx_3, 0, __pyx_num_neg_1);
Py_INCREF(__pyx_num_0);
PyTuple_SET_ITEM(__pyx_3, 1, __pyx_num_0);
- __pyx_4 = PyObject_GetItem(((PyObject *)__pyx_v_b), __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_4 = PyObject_GetItem(((PyObject *)__pyx_v_b), __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
- __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_INCREF(__pyx_num_0);
PyTuple_SET_ITEM(__pyx_3, 0, __pyx_num_0);
Py_INCREF(__pyx_num_0);
PyTuple_SET_ITEM(__pyx_3, 1, __pyx_num_0);
- __pyx_6 = PyObject_GetItem(((PyObject *)__pyx_v_b), __pyx_3); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_6 = PyObject_GetItem(((PyObject *)__pyx_v_b), __pyx_3); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
- __pyx_2 = PyObject_RichCompare(__pyx_4, __pyx_6, Py_NE); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_2 = PyObject_RichCompare(__pyx_4, __pyx_6, Py_NE); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_DECREF(__pyx_4); __pyx_4 = 0;
Py_DECREF(__pyx_6); __pyx_6 = 0;
- __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_2); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_2); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
if (!__pyx_1) {
Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_INCREF(__pyx_num_neg_1);
PyTuple_SET_ITEM(__pyx_3, 0, __pyx_num_neg_1);
Py_INCREF(__pyx_num_1);
PyTuple_SET_ITEM(__pyx_3, 1, __pyx_num_1);
- __pyx_4 = PyObject_GetItem(((PyObject *)__pyx_v_b), __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_4 = PyObject_GetItem(((PyObject *)__pyx_v_b), __pyx_3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
- __pyx_6 = PyTuple_New(2); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_6 = PyTuple_New(2); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_INCREF(__pyx_num_0);
PyTuple_SET_ITEM(__pyx_6, 0, __pyx_num_0);
Py_INCREF(__pyx_num_1);
PyTuple_SET_ITEM(__pyx_6, 1, __pyx_num_1);
- __pyx_3 = PyObject_GetItem(((PyObject *)__pyx_v_b), __pyx_6); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_3 = PyObject_GetItem(((PyObject *)__pyx_v_b), __pyx_6); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_DECREF(__pyx_6); __pyx_6 = 0;
- __pyx_2 = PyObject_RichCompare(__pyx_4, __pyx_3, Py_NE); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_2 = PyObject_RichCompare(__pyx_4, __pyx_3, Py_NE); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_DECREF(__pyx_4); __pyx_4 = 0;
Py_DECREF(__pyx_3); __pyx_3 = 0;
}
- __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_2); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;}
+ __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_2); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":230
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":224
* # Add closing coordinates to sequence?
* if b[-1,0] != b[0,0] or b[-1,1] != b[0,1]:
* M = m + 1 # <<<<<<<<<<<<<<
@@ -1291,11 +1294,11 @@
* M = m
*/
__pyx_v_M = (__pyx_v_m + 1);
- goto __pyx_L4;
+ goto __pyx_L3;
}
/*else*/ {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":232
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":226
* M = m + 1
* else:
* M = m # <<<<<<<<<<<<<<
@@ -1304,9 +1307,9 @@
*/
__pyx_v_M = __pyx_v_m;
}
- __pyx_L4:;
+ __pyx_L3:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":233
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":227
* else:
* M = m
* self._npts = M # <<<<<<<<<<<<<<
@@ -1315,7 +1318,7 @@
*/
((struct __pyx_obj_5_geos_Polygon *)__pyx_v_self)->__pyx_base._npts = __pyx_v_M;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":236
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":230
*
* # Create a coordinate sequence
* cs = GEOSCoordSeq_create(M, 2) # <<<<<<<<<<<<<<
@@ -1324,7 +1327,7 @@
*/
__pyx_v_cs = GEOSCoordSeq_create(__pyx_v_M,2);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":239
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":233
*
* # add to coordinate sequence
* bbuffer = <double *>b.data # <<<<<<<<<<<<<<
@@ -1333,7 +1336,7 @@
*/
__pyx_v_bbuffer = ((double (*))__pyx_v_b->data);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":240
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":234
* # add to coordinate sequence
* bbuffer = <double *>b.data
* for i from 0 <= i < m: # <<<<<<<<<<<<<<
@@ -1342,7 +1345,7 @@
*/
for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_m; __pyx_v_i++) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":241
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":235
* bbuffer = <double *>b.data
* for i from 0 <= i < m:
* dx = bbuffer[2*i] # <<<<<<<<<<<<<<
@@ -1351,7 +1354,7 @@
*/
__pyx_v_dx = (__pyx_v_bbuffer[(2 * __pyx_v_i)]);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":242
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":236
* for i from 0 <= i < m:
* dx = bbuffer[2*i]
* dy = bbuffer[2*i+1] # <<<<<<<<<<<<<<
@@ -1360,7 +1363,7 @@
*/
__pyx_v_dy = (__pyx_v_bbuffer[((2 * __pyx_v_i) + 1)]);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":245
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":239
* # Because of a bug in the GEOS C API,
* # always set X before Y
* GEOSCoordSeq_setX(cs, i, dx) # <<<<<<<<<<<<<<
@@ -1369,7 +1372,7 @@
*/
GEOSCoordSeq_setX(__pyx_v_cs,__pyx_v_i,__pyx_v_dx);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":246
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":240
* # always set X before Y
* GEOSCoordSeq_setX(cs, i, dx)
* GEOSCoordSeq_setY(cs, i, dy) # <<<<<<<<<<<<<<
@@ -1379,7 +1382,7 @@
GEOSCoordSeq_setY(__pyx_v_cs,__pyx_v_i,__pyx_v_dy);
}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":249
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":243
*
* # Add closing coordinates to sequence?
* if M > m: # <<<<<<<<<<<<<<
@@ -1389,7 +1392,7 @@
__pyx_1 = (__pyx_v_M > __pyx_v_m);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":250
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":244
* # Add closing coordinates to sequence?
* if M > m:
* dx = bbuffer[0] # <<<<<<<<<<<<<<
@@ -1398,7 +1401,7 @@
*/
__pyx_v_dx = (__pyx_v_bbuffer[0]);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":251
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":245
* if M > m:
* dx = bbuffer[0]
* dy = bbuffer[1] # <<<<<<<<<<<<<<
@@ -1407,7 +1410,7 @@
*/
__pyx_v_dy = (__pyx_v_bbuffer[1]);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":252
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":246
* dx = bbuffer[0]
* dy = bbuffer[1]
* GEOSCoordSeq_setX(cs, M-1, dx) # <<<<<<<<<<<<<<
@@ -1416,7 +1419,7 @@
*/
GEOSCoordSeq_setX(__pyx_v_cs,(__pyx_v_M - 1),__pyx_v_dx);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":253
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":247
* dy = bbuffer[1]
* GEOSCoordSeq_setX(cs, M-1, dx)
* GEOSCoordSeq_setY(cs, M-1, dy) # <<<<<<<<<<<<<<
@@ -1424,11 +1427,11 @@
* # create LinearRing
*/
GEOSCoordSeq_setY(__pyx_v_cs,(__pyx_v_M - 1),__pyx_v_dy);
- goto __pyx_L7;
+ goto __pyx_L6;
}
- __pyx_L7:;
+ __pyx_L6:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":256
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":250
*
* # create LinearRing
* lr = GEOSGeom_createLinearRing(cs) # <<<<<<<<<<<<<<
@@ -1437,7 +1440,7 @@
*/
__pyx_v_lr = GEOSGeom_createLinearRing(__pyx_v_cs);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":259
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":253
*
* # create Polygon from LinearRing (assuming no holes)
* self._geom = GEOSGeom_createPolygon(lr,NULL,0) # <<<<<<<<<<<<<<
@@ -1446,7 +1449,7 @@
*/
((struct __pyx_obj_5_geos_Polygon *)__pyx_v_self)->__pyx_base._geom = GEOSGeom_createPolygon(__pyx_v_lr,NULL,0);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":260
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":254
* # create Polygon from LinearRing (assuming no holes)
* self._geom = GEOSGeom_createPolygon(lr,NULL,0)
* self.boundary = b # <<<<<<<<<<<<<<
@@ -1479,7 +1482,7 @@
PyObject *__pyx_1 = 0;
Py_INCREF((PyObject *)__pyx_v_self);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":265
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":259
* def area(self):
* cdef double area
* GEOSArea(self._geom, &area) # <<<<<<<<<<<<<<
@@ -1488,14 +1491,14 @@
*/
GEOSArea(((struct __pyx_obj_5_geos_Polygon *)__pyx_v_self)->__pyx_base._geom,(&__pyx_v_area));
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":266
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":260
* cdef double area
* GEOSArea(self._geom, &area)
* return area # <<<<<<<<<<<<<<
*
* cdef _add_geom(BaseGeometry p, GEOSGeom *geom):
*/
- __pyx_1 = PyFloat_FromDouble(__pyx_v_area); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 266; goto __pyx_L1;}
+ __pyx_1 = PyFloat_FromDouble(__pyx_v_area); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; goto __pyx_L1;}
__pyx_r = __pyx_1;
__pyx_1 = 0;
goto __pyx_L0;
@@ -1519,7 +1522,7 @@
int __pyx_1;
Py_INCREF(__pyx_v_p);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":272
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":266
* cdef GEOSGeom *lr
* cdef unsigned int M
* if GEOSGeomTypeId(geom) == GEOS_POLYGON: # <<<<<<<<<<<<<<
@@ -1529,7 +1532,7 @@
__pyx_1 = (GEOSGeomTypeId(__pyx_v_geom) == GEOS_POLYGON);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":273
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":267
* cdef unsigned int M
* if GEOSGeomTypeId(geom) == GEOS_POLYGON:
* lr = GEOSGetExteriorRing(geom) # <<<<<<<<<<<<<<
@@ -1538,7 +1541,7 @@
*/
__pyx_v_lr = GEOSGetExteriorRing(__pyx_v_geom);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":274
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":268
* if GEOSGeomTypeId(geom) == GEOS_POLYGON:
* lr = GEOSGetExteriorRing(geom)
* cs = GEOSGeom_getCoordSeq(lr) # <<<<<<<<<<<<<<
@@ -1550,7 +1553,7 @@
}
/*else*/ {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":276
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":270
* cs = GEOSGeom_getCoordSeq(lr)
* else:
* cs = GEOSGeom_getCoordSeq(geom) # <<<<<<<<<<<<<<
@@ -1561,7 +1564,7 @@
}
__pyx_L2:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":277
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":271
* else:
* cs = GEOSGeom_getCoordSeq(geom)
* GEOSCoordSeq_getSize(cs, &M) # <<<<<<<<<<<<<<
@@ -1570,7 +1573,7 @@
*/
GEOSCoordSeq_getSize(__pyx_v_cs,(&__pyx_v_M));
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":278
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":272
* cs = GEOSGeom_getCoordSeq(geom)
* GEOSCoordSeq_getSize(cs, &M)
* p._geom = geom # <<<<<<<<<<<<<<
@@ -1579,7 +1582,7 @@
*/
__pyx_v_p->_geom = __pyx_v_geom;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":279
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":273
* GEOSCoordSeq_getSize(cs, &M)
* p._geom = geom
* p._npts = M # <<<<<<<<<<<<<<
@@ -1588,7 +1591,7 @@
*/
__pyx_v_p->_npts = __pyx_v_M;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":280
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":274
* p._geom = geom
* p._npts = M
* return p # <<<<<<<<<<<<<<
@@ -1627,7 +1630,7 @@
PyObject *__pyx_5 = 0;
__pyx_v_b = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":289
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":283
* cdef ndarray b
* cdef double *bbuffer
* if GEOSGeomTypeId(geom) == GEOS_POLYGON: # <<<<<<<<<<<<<<
@@ -1637,7 +1640,7 @@
__pyx_1 = (GEOSGeomTypeId(__pyx_v_geom) == GEOS_POLYGON);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":290
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":284
* cdef double *bbuffer
* if GEOSGeomTypeId(geom) == GEOS_POLYGON:
* lr = GEOSGetExteriorRing(geom) # <<<<<<<<<<<<<<
@@ -1646,7 +1649,7 @@
*/
__pyx_v_lr = GEOSGetExteriorRing(__pyx_v_geom);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":291
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":285
* if GEOSGeomTypeId(geom) == GEOS_POLYGON:
* lr = GEOSGetExteriorRing(geom)
* cs = GEOSGeom_getCoordSeq(lr) # <<<<<<<<<<<<<<
@@ -1658,7 +1661,7 @@
}
/*else*/ {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":293
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":287
* cs = GEOSGeom_getCoordSeq(lr)
* else:
* cs = GEOSGeom_getCoordSeq(geom) # <<<<<<<<<<<<<<
@@ -1669,7 +1672,7 @@
}
__pyx_L2:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":294
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":288
* else:
* cs = GEOSGeom_getCoordSeq(geom)
* GEOSCoordSeq_getSize(cs, &M) # <<<<<<<<<<<<<<
@@ -1678,39 +1681,39 @@
*/
GEOSCoordSeq_getSize(__pyx_v_cs,(&__pyx_v_M));
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":295
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":289
* cs = GEOSGeom_getCoordSeq(geom)
* GEOSCoordSeq_getSize(cs, &M)
* b = numpy.empty((M,2), numpy.float64) # <<<<<<<<<<<<<<
* bbuffer = <double *>b.data
* for i from 0 <= i < M:
*/
- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
- __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
+ __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_2 = PyLong_FromUnsignedLong(__pyx_v_M); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
- __pyx_4 = PyTuple_New(2); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
+ __pyx_2 = PyLong_FromUnsignedLong(__pyx_v_M); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
+ __pyx_4 = PyTuple_New(2); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2);
Py_INCREF(__pyx_num_2);
PyTuple_SET_ITEM(__pyx_4, 1, __pyx_num_2);
__pyx_2 = 0;
- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
- __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_float64); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
+ __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_float64); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_2 = PyTuple_New(2); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
+ __pyx_2 = PyTuple_New(2); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4);
PyTuple_SET_ITEM(__pyx_2, 1, __pyx_5);
__pyx_4 = 0;
__pyx_5 = 0;
- __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
+ __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
Py_DECREF(__pyx_2); __pyx_2 = 0;
- if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_5_geos_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; goto __pyx_L1;}
+ if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_5_geos_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
Py_DECREF(((PyObject *)__pyx_v_b));
__pyx_v_b = ((PyArrayObject *)__pyx_4);
__pyx_4 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":296
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":290
* GEOSCoordSeq_getSize(cs, &M)
* b = numpy.empty((M,2), numpy.float64)
* bbuffer = <doub...
[truncated message content] |
