Revision: 4260
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4260&view=rev
Author: jswhit
Date: 2007-11-13 15:03:46 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
remove obsolete function
Modified Paths:
--------------
trunk/toolkits/basemap-testing/src/_geos.c
trunk/toolkits/basemap-testing/src/_geos.pyx
Modified: trunk/toolkits/basemap-testing/src/_geos.c
===================================================================
--- trunk/toolkits/basemap-testing/src/_geos.c 2007-11-13 23:02:59 UTC (rev
4259)
+++ trunk/toolkits/basemap-testing/src/_geos.c 2007-11-13 23:03:46 UTC (rev
4260)
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.9.6.7 on Tue Nov 13 16:02:30 2007 */
+/* Generated by Cython 0.9.6.7 on Tue Nov 13 16:03:26 2007 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -123,7 +123,6 @@
static PyTypeObject *__pyx_ptype_5_geos_Point = 0;
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*/
static PyObject *(__pyx_f_5_geos__get_coords(GEOSGeom (*))); /*proto*/
@@ -1496,7 +1495,7 @@
* GEOSArea(self._geom, &area)
* return area # <<<<<<<<<<<<<<
*
- * cdef _add_geom(BaseGeometry p, GEOSGeom *geom):
+ * cdef _get_coords(GEOSGeom *geom):
*/
__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;
@@ -1514,100 +1513,6 @@
return __pyx_r;
}
-static PyObject *__pyx_f_5_geos__add_geom(struct
__pyx_obj_5_geos_BaseGeometry *__pyx_v_p,GEOSGeom (*__pyx_v_geom)) {
- GEOSCoordSeq (*__pyx_v_cs);
- GEOSGeom (*__pyx_v_lr);
- unsigned int __pyx_v_M;
- PyObject *__pyx_r;
- int __pyx_1;
- Py_INCREF(__pyx_v_p);
-
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":266
- * cdef GEOSGeom *lr
- * cdef unsigned int M
- * if GEOSGeomTypeId(geom) == GEOS_POLYGON: # <<<<<<<<<<<<<<
- * lr = GEOSGetExteriorRing(geom)
- * cs = GEOSGeom_getCoordSeq(lr)
- */
- __pyx_1 = (GEOSGeomTypeId(__pyx_v_geom) == GEOS_POLYGON);
- if (__pyx_1) {
-
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":267
- * cdef unsigned int M
- * if GEOSGeomTypeId(geom) == GEOS_POLYGON:
- * lr = GEOSGetExteriorRing(geom) # <<<<<<<<<<<<<<
- * cs = GEOSGeom_getCoordSeq(lr)
- * else:
- */
- __pyx_v_lr = GEOSGetExteriorRing(__pyx_v_geom);
-
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":268
- * if GEOSGeomTypeId(geom) == GEOS_POLYGON:
- * lr = GEOSGetExteriorRing(geom)
- * cs = GEOSGeom_getCoordSeq(lr) # <<<<<<<<<<<<<<
- * else:
- * cs = GEOSGeom_getCoordSeq(geom)
- */
- __pyx_v_cs = GEOSGeom_getCoordSeq(__pyx_v_lr);
- goto __pyx_L2;
- }
- /*else*/ {
-
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":270
- * cs = GEOSGeom_getCoordSeq(lr)
- * else:
- * cs = GEOSGeom_getCoordSeq(geom) # <<<<<<<<<<<<<<
- * GEOSCoordSeq_getSize(cs, &M)
- * p._geom = geom
- */
- __pyx_v_cs = GEOSGeom_getCoordSeq(__pyx_v_geom);
- }
- __pyx_L2:;
-
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":271
- * else:
- * cs = GEOSGeom_getCoordSeq(geom)
- * GEOSCoordSeq_getSize(cs, &M) # <<<<<<<<<<<<<<
- * p._geom = geom
- * p._npts = M
- */
- GEOSCoordSeq_getSize(__pyx_v_cs,(&__pyx_v_M));
-
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":272
- * cs = GEOSGeom_getCoordSeq(geom)
- * GEOSCoordSeq_getSize(cs, &M)
- * p._geom = geom # <<<<<<<<<<<<<<
- * p._npts = M
- * return p
- */
- __pyx_v_p->_geom = __pyx_v_geom;
-
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":273
- * GEOSCoordSeq_getSize(cs, &M)
- * p._geom = geom
- * p._npts = M # <<<<<<<<<<<<<<
- * return p
- *
- */
- __pyx_v_p->_npts = __pyx_v_M;
-
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":274
- * p._geom = geom
- * p._npts = M
- * return p # <<<<<<<<<<<<<<
- *
- * cdef _get_coords(GEOSGeom *geom):
- */
- Py_INCREF(((PyObject *)__pyx_v_p));
- __pyx_r = ((PyObject *)__pyx_v_p);
- goto __pyx_L0;
-
- __pyx_r = Py_None; Py_INCREF(Py_None);
- __pyx_L0:;
- Py_DECREF(__pyx_v_p);
- return __pyx_r;
-}
-
static PyObject *__pyx_num_2;
static PyObject *__pyx_n_empty;
@@ -1630,7 +1535,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":283
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":269
* cdef ndarray b
* cdef double *bbuffer
* if GEOSGeomTypeId(geom) == GEOS_POLYGON: # <<<<<<<<<<<<<<
@@ -1640,7 +1545,7 @@
__pyx_1 = (GEOSGeomTypeId(__pyx_v_geom) == GEOS_POLYGON);
if (__pyx_1) {
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":284
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":270
* cdef double *bbuffer
* if GEOSGeomTypeId(geom) == GEOS_POLYGON:
* lr = GEOSGetExteriorRing(geom) # <<<<<<<<<<<<<<
@@ -1649,7 +1554,7 @@
*/
__pyx_v_lr = GEOSGetExteriorRing(__pyx_v_geom);
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":285
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":271
* if GEOSGeomTypeId(geom) == GEOS_POLYGON:
* lr = GEOSGetExteriorRing(geom)
* cs = GEOSGeom_getCoordSeq(lr) # <<<<<<<<<<<<<<
@@ -1661,7 +1566,7 @@
}
/*else*/ {
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":287
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":273
* cs = GEOSGeom_getCoordSeq(lr)
* else:
* cs = GEOSGeom_getCoordSeq(geom) # <<<<<<<<<<<<<<
@@ -1672,7 +1577,7 @@
}
__pyx_L2:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":288
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":274
* else:
* cs = GEOSGeom_getCoordSeq(geom)
* GEOSCoordSeq_getSize(cs, &M) # <<<<<<<<<<<<<<
@@ -1681,39 +1586,39 @@
*/
GEOSCoordSeq_getSize(__pyx_v_cs,(&__pyx_v_M));
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":289
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":275
* 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 = 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;}
+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (unlikely(!__pyx_2))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
+ __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (unlikely(!__pyx_3))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; 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 = 289; goto __pyx_L1;}
- __pyx_4 = PyTuple_New(2); if (unlikely(!__pyx_4)) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;}
+ __pyx_2 = PyLong_FromUnsignedLong(__pyx_v_M); if (unlikely(!__pyx_2))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
+ __pyx_4 = PyTuple_New(2); if (unlikely(!__pyx_4)) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 275; 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 = 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;}
+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (unlikely(!__pyx_2))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;}
+ __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_float64); if
(unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; 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 = 289; goto __pyx_L1;}
+ __pyx_2 = PyTuple_New(2); if (unlikely(!__pyx_2)) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 275; 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 = 289; goto __pyx_L1;}
+ __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (unlikely(!__pyx_4))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; 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 = 289; goto __pyx_L1;}
+ if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_5_geos_ndarray)) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 275; 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":290
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":276
* GEOSCoordSeq_getSize(cs, &M)
* b = numpy.empty((M,2), numpy.float64)
* bbuffer = <double *>b.data # <<<<<<<<<<<<<<
@@ -1722,7 +1627,7 @@
*/
__pyx_v_bbuffer = ((double (*))__pyx_v_b->data);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":291
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":277
* b = numpy.empty((M,2), numpy.float64)
* bbuffer = <double *>b.data
* for i from 0 <= i < M: # <<<<<<<<<<<<<<
@@ -1731,7 +1636,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":292
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":278
* bbuffer = <double *>b.data
* for i from 0 <= i < M:
* GEOSCoordSeq_getX(cs, i, &dx) # <<<<<<<<<<<<<<
@@ -1740,7 +1645,7 @@
*/
GEOSCoordSeq_getX(__pyx_v_cs,__pyx_v_i,(&__pyx_v_dx));
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":293
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":279
* for i from 0 <= i < M:
* GEOSCoordSeq_getX(cs, i, &dx)
* GEOSCoordSeq_getY(cs, i, &dy) # <<<<<<<<<<<<<<
@@ -1749,7 +1654,7 @@
*/
GEOSCoordSeq_getY(__pyx_v_cs,__pyx_v_i,(&__pyx_v_dy));
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":294
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":280
* GEOSCoordSeq_getX(cs, i, &dx)
* GEOSCoordSeq_getY(cs, i, &dy)
* bbuffer[2*i] = dx # <<<<<<<<<<<<<<
@@ -1758,7 +1663,7 @@
*/
(__pyx_v_bbuffer[(2 * __pyx_v_i)]) = __pyx_v_dx;
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":295
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":281
* GEOSCoordSeq_getY(cs, i, &dy)
* bbuffer[2*i] = dx
* bbuffer[2*i+1] = dy # <<<<<<<<<<<<<<
@@ -1768,7 +1673,7 @@
(__pyx_v_bbuffer[((2 * __pyx_v_i) + 1)]) = __pyx_v_dy;
}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":296
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":282
* bbuffer[2*i] = dx
* bbuffer[2*i+1] = dy
* return b # <<<<<<<<<<<<<<
@@ -1812,9 +1717,9 @@
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 = 299; 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 = 285; goto __pyx_L1;}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":307
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":293
* # make sure data is contiguous.
* # if not, make a local copy.
* if not PyArray_ISCONTIGUOUS(b): # <<<<<<<<<<<<<<
@@ -1824,17 +1729,17 @@
__pyx_1 = (!PyArray_ISCONTIGUOUS(__pyx_v_b));
if (__pyx_1) {
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":308
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":294
* # 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 = 308; goto
__pyx_L1;}
- __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (unlikely(!__pyx_3))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 308; 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 = 294; goto
__pyx_L1;}
+ __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (unlikely(!__pyx_3))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 294; 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 = 308; goto __pyx_L1;}
+ if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_5_geos_ndarray)) {__pyx_filename
= __pyx_f[0]; __pyx_lineno = 294; goto __pyx_L1;}
Py_DECREF(((PyObject *)__pyx_v_b));
__pyx_v_b = ((PyArrayObject *)__pyx_3);
__pyx_3 = 0;
@@ -1842,29 +1747,29 @@
}
__pyx_L2:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":310
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":296
* b = b.copy()
*
* M = b.shape[0] # <<<<<<<<<<<<<<
* self._npts = M
*
*/
- __pyx_2 = PyObject_GetAttr(((PyObject *)__pyx_v_b), __pyx_n_shape); if
(unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; 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 = 296; 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 = 310; goto __pyx_L1;}
- __pyx_4 = PyObject_GetItem(__pyx_2, __pyx_3); if (unlikely(!__pyx_4))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; goto __pyx_L1;}
+ __pyx_3 = PyInt_FromLong(0); if (unlikely(!__pyx_3)) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 296; goto __pyx_L1;}
+ __pyx_4 = PyObject_GetItem(__pyx_2, __pyx_3); if (unlikely(!__pyx_4))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_5 = PyInt_AsLong(__pyx_4); if (unlikely((__pyx_5 == -1) &&
PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; goto
__pyx_L1;}
+ __pyx_5 = PyInt_AsLong(__pyx_4); if (unlikely((__pyx_5 == -1) &&
PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 296; 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":311
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":297
*
* M = b.shape[0]
* self._npts = M # <<<<<<<<<<<<<<
@@ -1873,7 +1778,7 @@
*/
((struct __pyx_obj_5_geos_LineString *)__pyx_v_self)->__pyx_base._npts =
__pyx_v_M;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":314
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":300
*
* # Create a coordinate sequence
* cs = GEOSCoordSeq_create(M, 2) # <<<<<<<<<<<<<<
@@ -1882,7 +1787,7 @@
*/
__pyx_v_cs = GEOSCoordSeq_create(__pyx_v_M,2);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":317
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":303
*
* # add to coordinate sequence
* bbuffer = <double *>b.data # <<<<<<<<<<<<<<
@@ -1891,7 +1796,7 @@
*/
__pyx_v_bbuffer = ((double (*))__pyx_v_b->data);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":318
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":304
* # add to coordinate sequence
* bbuffer = <double *>b.data
* for i from 0 <= i < M: # <<<<<<<<<<<<<<
@@ -1900,7 +1805,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":319
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":305
* bbuffer = <double *>b.data
* for i from 0 <= i < M:
* dx = bbuffer[2*i] # <<<<<<<<<<<<<<
@@ -1909,7 +1814,7 @@
*/
__pyx_v_dx = (__pyx_v_bbuffer[(2 * __pyx_v_i)]);
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":320
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":306
* for i from 0 <= i < M:
* dx = bbuffer[2*i]
* dy = bbuffer[2*i+1] # <<<<<<<<<<<<<<
@@ -1918,7 +1823,7 @@
*/
__pyx_v_dy = (__pyx_v_bbuffer[((2 * __pyx_v_i) + 1)]);
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":323
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":309
* # Because of a bug in the GEOS C API,
* # always set X before Y
* GEOSCoordSeq_setX(cs, i, dx) # <<<<<<<<<<<<<<
@@ -1927,7 +1832,7 @@
*/
GEOSCoordSeq_setX(__pyx_v_cs,__pyx_v_i,__pyx_v_dx);
- /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":324
+ /*
"/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":310
* # always set X before Y
* GEOSCoordSeq_setX(cs, i, dx)
* GEOSCoordSeq_setY(cs, i, dy) # <<<<<<<<<<<<<<
@@ -1937,7 +1842,7 @@
GEOSCoordSeq_setY(__pyx_v_cs,__pyx_v_i,__pyx_v_dy);
}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":327
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":313
*
* # create LineString
* self._geom = GEOSGeom_createLineString(cs) #
<<<<<<<<<<<<<<
@@ -1946,7 +1851,7 @@
*/
((struct __pyx_obj_5_geos_LineString *)__pyx_v_self)->__pyx_base._geom =
GEOSGeom_createLineString(__pyx_v_cs);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":328
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":314
* # create LineString
* self._geom = GEOSGeom_createLineString(cs)
* self.boundary = b # <<<<<<<<<<<<<<
@@ -1986,7 +1891,7 @@
Py_INCREF((PyObject *)__pyx_v_self);
Py_INCREF(__pyx_v_b);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":336
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":322
* cdef GEOSCoordSeq *cs
* # Create a coordinate sequence
* cs = GEOSCoordSeq_create(1, 2) # <<<<<<<<<<<<<<
@@ -1995,7 +1900,7 @@
*/
__pyx_v_cs = GEOSCoordSeq_create(1,2);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":337
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":323
* # Create a coordinate sequence
* cs = GEOSCoordSeq_create(1, 2)
* dx = b[0]; dy = b[1] # <<<<<<<<<<<<<<
@@ -2007,15 +1912,15 @@
} else if (PyTuple_CheckExact(__pyx_v_b) && 0 <= 0 && 0 <
PyTuple_GET_SIZE(__pyx_v_b)) {
__pyx_2 = PyTuple_GET_ITEM(__pyx_v_b, 0); Py_INCREF(__pyx_2);
} else {
- __pyx_1 = PyInt_FromLong(0); if (unlikely(!__pyx_1)) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
- __pyx_2 = PyObject_GetItem(__pyx_v_b, __pyx_1); if (unlikely(!__pyx_2))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
+ __pyx_1 = PyInt_FromLong(0); if (unlikely(!__pyx_1)) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 323; goto __pyx_L1;}
+ __pyx_2 = PyObject_GetItem(__pyx_v_b, __pyx_1); if (unlikely(!__pyx_2))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
}
- __pyx_3 = PyFloat_AsDouble(__pyx_2); if (unlikely(PyErr_Occurred()))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
+ __pyx_3 = PyFloat_AsDouble(__pyx_2); if (unlikely(PyErr_Occurred()))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
__pyx_v_dx = __pyx_3;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":337
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":323
* # Create a coordinate sequence
* cs = GEOSCoordSeq_create(1, 2)
* dx = b[0]; dy = b[1] # <<<<<<<<<<<<<<
@@ -2027,15 +1932,15 @@
} else if (PyTuple_CheckExact(__pyx_v_b) && 0 <= 1 && 1 <
PyTuple_GET_SIZE(__pyx_v_b)) {
__pyx_2 = PyTuple_GET_ITEM(__pyx_v_b, 1); Py_INCREF(__pyx_2);
} else {
- __pyx_1 = PyInt_FromLong(1); if (unlikely(!__pyx_1)) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
- __pyx_2 = PyObject_GetItem(__pyx_v_b, __pyx_1); if (unlikely(!__pyx_2))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
+ __pyx_1 = PyInt_FromLong(1); if (unlikely(!__pyx_1)) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 323; goto __pyx_L1;}
+ __pyx_2 = PyObject_GetItem(__pyx_v_b, __pyx_1); if (unlikely(!__pyx_2))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
}
- __pyx_3 = PyFloat_AsDouble(__pyx_2); if (unlikely(PyErr_Occurred()))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;}
+ __pyx_3 = PyFloat_AsDouble(__pyx_2); if (unlikely(PyErr_Occurred()))
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
__pyx_v_dy = __pyx_3;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":338
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":324
* cs = GEOSCoordSeq_create(1, 2)
* dx = b[0]; dy = b[1]
* GEOSCoordSeq_setX(cs, 0, dx) # <<<<<<<<<<<<<<
@@ -2044,7 +1949,7 @@
*/
GEOSCoordSeq_setX(__pyx_v_cs,0,__pyx_v_dx);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":339
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":325
* dx = b[0]; dy = b[1]
* GEOSCoordSeq_setX(cs, 0, dx)
* GEOSCoordSeq_setY(cs, 0, dy) # <<<<<<<<<<<<<<
@@ -2053,7 +1958,7 @@
*/
GEOSCoordSeq_setY(__pyx_v_cs,0,__pyx_v_dy);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":340
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":326
* GEOSCoordSeq_setX(cs, 0, dx)
* GEOSCoordSeq_setY(cs, 0, dy)
* self._geom = GEOSGeom_createPoint(cs) # <<<<<<<<<<<<<<
@@ -2062,7 +1967,7 @@
*/
((struct __pyx_obj_5_geos_Point *)__pyx_v_self)->__pyx_base._geom =
GEOSGeom_createPoint(__pyx_v_cs);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":341
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":327
* GEOSCoordSeq_setY(cs, 0, dy)
* self._geom = GEOSGeom_createPoint(cs)
* self._npts = 1 # <<<<<<<<<<<<<<
@@ -2070,7 +1975,7 @@
*/
((struct __pyx_obj_5_geos_Point *)__pyx_v_self)->__pyx_base._npts = 1;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":342
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":328
* self._geom = GEOSGeom_createPoint(cs)
* self._npts = 1
* self.boundary = b # <<<<<<<<<<<<<<
@@ -2786,13 +2691,13 @@
if (PyObject_SetAttrString(__pyx_m, "Polygon", (PyObject
*)&__pyx_type_5_geos_Polygon) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno =
206; goto __pyx_L1;}
__pyx_ptype_5_geos_Polygon = &__pyx_type_5_geos_Polygon;
__pyx_type_5_geos_LineString.tp_base = __pyx_ptype_5_geos_BaseGeometry;
- if (PyType_Ready(&__pyx_type_5_geos_LineString) < 0) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 298; goto __pyx_L1;}
- if (PyObject_SetAttrString(__pyx_m, "LineString", (PyObject
*)&__pyx_type_5_geos_LineString) < 0) {__pyx_filename = __pyx_f[0];
__pyx_lineno = 298; goto __pyx_L1;}
+ if (PyType_Ready(&__pyx_type_5_geos_LineString) < 0) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 284; goto __pyx_L1;}
+ if (PyObject_SetAttrString(__pyx_m, "LineString", (PyObject
*)&__pyx_type_5_geos_LineString) < 0) {__pyx_filename = __pyx_f[0];
__pyx_lineno = 284; goto __pyx_L1;}
__pyx_ptype_5_geos_LineString = &__pyx_type_5_geos_LineString;
__pyx_type_5_geos_Point.tp_base = __pyx_ptype_5_geos_BaseGeometry;
__pyx_type_5_geos_Point.tp_free = _PyObject_GC_Del;
- if (PyType_Ready(&__pyx_type_5_geos_Point) < 0) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 330; goto __pyx_L1;}
- if (PyObject_SetAttrString(__pyx_m, "Point", (PyObject
*)&__pyx_type_5_geos_Point) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno =
330; goto __pyx_L1;}
+ if (PyType_Ready(&__pyx_type_5_geos_Point) < 0) {__pyx_filename =
__pyx_f[0]; __pyx_lineno = 316; goto __pyx_L1;}
+ if (PyObject_SetAttrString(__pyx_m, "Point", (PyObject
*)&__pyx_type_5_geos_Point) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno =
316; goto __pyx_L1;}
__pyx_ptype_5_geos_Point = &__pyx_type_5_geos_Point;
/* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":1
@@ -2841,7 +2746,7 @@
*/
initGEOS(__pyx_f_5_geos_notice_h,__pyx_f_5_geos_error_h);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":332
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":318
* cdef class Point(BaseGeometry):
* cdef public x,y
* def __init__(self, b): # <<<<<<<<<<<<<<
Modified: trunk/toolkits/basemap-testing/src/_geos.pyx
===================================================================
--- trunk/toolkits/basemap-testing/src/_geos.pyx 2007-11-13 23:02:59 UTC
(rev 4259)
+++ trunk/toolkits/basemap-testing/src/_geos.pyx 2007-11-13 23:03:46 UTC
(rev 4260)
@@ -259,20 +259,6 @@
GEOSArea(self._geom, &area)
return area
-cdef _add_geom(BaseGeometry p, GEOSGeom *geom):
- cdef GEOSCoordSeq *cs
- cdef GEOSGeom *lr
- cdef unsigned int M
- if GEOSGeomTypeId(geom) == GEOS_POLYGON:
- lr = GEOSGetExteriorRing(geom)
- cs = GEOSGeom_getCoordSeq(lr)
- else:
- cs = GEOSGeom_getCoordSeq(geom)
- GEOSCoordSeq_getSize(cs, &M)
- p._geom = geom
- p._npts = M
- return p
-
cdef _get_coords(GEOSGeom *geom):
cdef GEOSCoordSeq *cs
cdef GEOSGeom *lr
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
