Menu
▾
▴
SF.net SVN: matplotlib: [4321] trunk/toolkits/basemap-testing/src
|
From: <js...@us...> - 2007-11-15 21:00:12
|
Revision: 4321
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4321&view=rev
Author: jswhit
Date: 2007-11-15 13:00:07 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
library version now a module variable (__geos_version__)
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-15 20:26:03 UTC (rev 4320)
+++ trunk/toolkits/basemap-testing/src/_geos.c 2007-11-15 21:00:07 UTC (rev 4321)
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.9.6.8 on Wed Nov 14 11:06:42 2007 */
+/* Generated by Cython 0.9.6.8 on Thu Nov 15 13:56:55 2007 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -146,17 +146,16 @@
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_geos_version(void); /*proto*/
static PyObject *__pyx_f_5_geos__get_coords(GEOSGeom *); /*proto*/
/* Implementation of _geos */
static char __pyx_k3[] = "0.1";
-static char __pyx_k4[] = "version 2.2.3 of the geos library is required";
+static char __pyx_k4[] = "2.2.3-CAPI-1.1.1";
+static char __pyx_k5[] = "version 2.2.3 of the geos library is required";
-static PyObject *__pyx_num_2;
-static PyObject *__pyx_num_3;
-
static PyObject *__pyx_n_is_valid;
static PyObject *__pyx_n_geom_type;
static PyObject *__pyx_n_within;
@@ -170,20 +169,21 @@
static PyObject *__pyx_n_sys;
static PyObject *__pyx_n_numpy;
static PyObject *__pyx_n___version__;
-static PyObject *__pyx_n_geos_version;
+static PyObject *__pyx_n___geos_version__;
static PyObject *__pyx_n_ValueError;
static PyObject *__pyx_k3p;
static PyObject *__pyx_k4p;
+static PyObject *__pyx_k5p;
static PyObject *__pyx_builtin_ValueError;
static PyObject *__pyx_n_stdout;
static PyObject *__pyx_n_write;
-static PyObject *__pyx_k5p;
+static PyObject *__pyx_k6p;
-static char __pyx_k5[] = "GEOS_NOTICE: %s\n";
+static char __pyx_k6[] = "GEOS_NOTICE: %s\n";
static void __pyx_f_5_geos_notice_h(char *__pyx_v_fmt,char *__pyx_v_msg) {
PyObject *__pyx_v_format;
@@ -196,31 +196,31 @@
__pyx_v_message = Py_None; Py_INCREF(Py_None);
__pyx_v_warn_msg = Py_None; Py_INCREF(Py_None);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":103
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":101
*
* cdef void notice_h(char *fmt, char*msg):
* format = PyString_FromString(fmt) # <<<<<<<<<<<<<<
* message = PyString_FromString(msg)
* try:
*/
- __pyx_1 = PyString_FromString(__pyx_v_fmt); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 103; goto __pyx_L1;}
+ __pyx_1 = PyString_FromString(__pyx_v_fmt); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; goto __pyx_L1;}
Py_DECREF(__pyx_v_format);
__pyx_v_format = __pyx_1;
__pyx_1 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":104
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":102
* cdef void notice_h(char *fmt, char*msg):
* format = PyString_FromString(fmt)
* message = PyString_FromString(msg) # <<<<<<<<<<<<<<
* try:
* warn_msg = format % message
*/
- __pyx_1 = PyString_FromString(__pyx_v_msg); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; goto __pyx_L1;}
+ __pyx_1 = PyString_FromString(__pyx_v_msg); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; goto __pyx_L1;}
Py_DECREF(__pyx_v_message);
__pyx_v_message = __pyx_1;
__pyx_1 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":105
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":103
* format = PyString_FromString(fmt)
* message = PyString_FromString(msg)
* try: # <<<<<<<<<<<<<<
@@ -228,7 +228,7 @@
* except:
*/
/*try:*/ {
- __pyx_1 = PyNumber_Remainder(__pyx_v_format, __pyx_v_message); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; goto __pyx_L2;}
+ __pyx_1 = PyNumber_Remainder(__pyx_v_format, __pyx_v_message); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; goto __pyx_L2;}
Py_DECREF(__pyx_v_warn_msg);
__pyx_v_warn_msg = __pyx_1;
__pyx_1 = 0;
@@ -237,7 +237,7 @@
__pyx_L2:;
Py_XDECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":107
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":105
* try:
* warn_msg = format % message
* except: # <<<<<<<<<<<<<<
@@ -246,7 +246,7 @@
*/
/*except:*/ {
__Pyx_AddTraceback("_geos.notice_h");
- if (__Pyx_GetException(&__pyx_1, &__pyx_2, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
+ if (__Pyx_GetException(&__pyx_1, &__pyx_2, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; goto __pyx_L1;}
Py_INCREF(__pyx_v_format);
Py_DECREF(__pyx_v_warn_msg);
__pyx_v_warn_msg = __pyx_v_format;
@@ -257,23 +257,23 @@
}
__pyx_L3:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":109
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":107
* except:
* warn_msg = format
* sys.stdout.write('GEOS_NOTICE: %s\n' % warn_msg) # <<<<<<<<<<<<<<
*
* cdef void error_h(char *fmt, char*msg):
*/
- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
- __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_stdout); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
+ __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_stdout); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
- __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_write); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
+ __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_write); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_1 = PyNumber_Remainder(__pyx_k5p, __pyx_v_warn_msg); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
- __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
+ __pyx_1 = PyNumber_Remainder(__pyx_k6p, __pyx_v_warn_msg); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
+ __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
__pyx_1 = 0;
- __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;}
+ __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
Py_DECREF(__pyx_2); __pyx_2 = 0;
Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -292,9 +292,9 @@
static PyObject *__pyx_n_stderr;
-static PyObject *__pyx_k6p;
+static PyObject *__pyx_k7p;
-static char __pyx_k6[] = "GEOS_ERROR: %s\n";
+static char __pyx_k7[] = "GEOS_ERROR: %s\n";
static void __pyx_f_5_geos_error_h(char *__pyx_v_fmt,char *__pyx_v_msg) {
PyObject *__pyx_v_format;
@@ -307,31 +307,31 @@
__pyx_v_message = Py_None; Py_INCREF(Py_None);
__pyx_v_warn_msg = Py_None; Py_INCREF(Py_None);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":112
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":110
*
* cdef void error_h(char *fmt, char*msg):
* format = PyString_FromString(fmt) # <<<<<<<<<<<<<<
* message = PyString_FromString(msg)
* try:
*/
- __pyx_1 = PyString_FromString(__pyx_v_fmt); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; goto __pyx_L1;}
+ __pyx_1 = PyString_FromString(__pyx_v_fmt); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 110; goto __pyx_L1;}
Py_DECREF(__pyx_v_format);
__pyx_v_format = __pyx_1;
__pyx_1 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":113
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":111
* cdef void error_h(char *fmt, char*msg):
* format = PyString_FromString(fmt)
* message = PyString_FromString(msg) # <<<<<<<<<<<<<<
* try:
* warn_msg = format % message
*/
- __pyx_1 = PyString_FromString(__pyx_v_msg); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; goto __pyx_L1;}
+ __pyx_1 = PyString_FromString(__pyx_v_msg); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; goto __pyx_L1;}
Py_DECREF(__pyx_v_message);
__pyx_v_message = __pyx_1;
__pyx_1 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":114
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":112
* format = PyString_FromString(fmt)
* message = PyString_FromString(msg)
* try: # <<<<<<<<<<<<<<
@@ -339,7 +339,7 @@
* except:
*/
/*try:*/ {
- __pyx_1 = PyNumber_Remainder(__pyx_v_format, __pyx_v_message); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; goto __pyx_L2;}
+ __pyx_1 = PyNumber_Remainder(__pyx_v_format, __pyx_v_message); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; goto __pyx_L2;}
Py_DECREF(__pyx_v_warn_msg);
__pyx_v_warn_msg = __pyx_1;
__pyx_1 = 0;
@@ -348,7 +348,7 @@
__pyx_L2:;
Py_XDECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":116
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":114
* try:
* warn_msg = format % message
* except: # <<<<<<<<<<<<<<
@@ -357,7 +357,7 @@
*/
/*except:*/ {
__Pyx_AddTraceback("_geos.error_h");
- if (__Pyx_GetException(&__pyx_1, &__pyx_2, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L1;}
+ if (__Pyx_GetException(&__pyx_1, &__pyx_2, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; goto __pyx_L1;}
Py_INCREF(__pyx_v_format);
Py_DECREF(__pyx_v_warn_msg);
__pyx_v_warn_msg = __pyx_v_format;
@@ -368,23 +368,23 @@
}
__pyx_L3:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":118
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":116
* except:
* warn_msg = format
* sys.stderr.write('GEOS_ERROR: %s\n' % warn_msg) # <<<<<<<<<<<<<<
*
* # check library version
*/
- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
- __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_stderr); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L1;}
+ __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_stderr); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
- __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_write); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
+ __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_write); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_1 = PyNumber_Remainder(__pyx_k6p, __pyx_v_warn_msg); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
- __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
+ __pyx_1 = PyNumber_Remainder(__pyx_k7p, __pyx_v_warn_msg); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L1;}
+ __pyx_2 = PyTuple_New(1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
__pyx_1 = 0;
- __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; goto __pyx_L1;}
+ __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
Py_DECREF(__pyx_2); __pyx_2 = 0;
Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -401,6 +401,24 @@
Py_DECREF(__pyx_v_warn_msg);
}
+static PyObject *__pyx_f_5_geos_geos_version(void) {
+ PyObject *__pyx_r;
+ PyObject *__pyx_1 = 0;
+ __pyx_1 = PyString_FromString(GEOSversion()); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;}
+ __pyx_r = __pyx_1;
+ __pyx_1 = 0;
+ goto __pyx_L0;
+
+ __pyx_r = Py_None; Py_INCREF(Py_None);
+ goto __pyx_L0;
+ __pyx_L1:;
+ Py_XDECREF(__pyx_1);
+ __Pyx_AddTraceback("_geos.geos_version");
+ __pyx_r = 0;
+ __pyx_L0:;
+ return __pyx_r;
+}
+
static PyObject *__pyx_pf_5_geos_12BaseGeometry_is_valid(PyObject *__pyx_v_self, PyObject *unused); /*proto*/
static PyObject *__pyx_pf_5_geos_12BaseGeometry_is_valid(PyObject *__pyx_v_self, PyObject *unused) {
char __pyx_v_valid;
@@ -408,7 +426,7 @@
char __pyx_1;
Py_INCREF(__pyx_v_self);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":134
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":134
* def is_valid(self):
* cdef char valid
* valid = GEOSisValid(self._geom) # <<<<<<<<<<<<<<
@@ -417,7 +435,7 @@
*/
__pyx_v_valid = GEOSisValid(((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_self)->_geom);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":135
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":135
* cdef char valid
* valid = GEOSisValid(self._geom)
* if valid: # <<<<<<<<<<<<<<
@@ -476,7 +494,7 @@
Py_INCREF(__pyx_v_geom);
if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_geom), __pyx_ptype_5_geos_BaseGeometry, 1, "geom"))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; goto __pyx_L1;}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":146
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":146
* cdef GEOSGeom *g1, *g2
* cdef char answer
* g1 = self._geom # <<<<<<<<<<<<<<
@@ -485,7 +503,7 @@
*/
__pyx_v_g1 = ((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_self)->_geom;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":147
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":147
* cdef char answer
* g1 = self._geom
* g2 = geom._geom # <<<<<<<<<<<<<<
@@ -494,7 +512,7 @@
*/
__pyx_v_g2 = ((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_geom)->_geom;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":148
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":148
* g1 = self._geom
* g2 = geom._geom
* answer = GEOSWithin(g1, g2) # <<<<<<<<<<<<<<
@@ -503,7 +521,7 @@
*/
__pyx_v_answer = GEOSWithin(__pyx_v_g1,__pyx_v_g2);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":149
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":149
* g2 = geom._geom
* answer = GEOSWithin(g1, g2)
* if answer: # <<<<<<<<<<<<<<
@@ -546,7 +564,7 @@
Py_INCREF(__pyx_v_geom);
if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_geom), __pyx_ptype_5_geos_BaseGeometry, 1, "geom"))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 154; goto __pyx_L1;}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":157
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":157
* cdef GEOSGeom *g1, *g2
* cdef char answer
* g1 = self._geom # <<<<<<<<<<<<<<
@@ -555,7 +573,7 @@
*/
__pyx_v_g1 = ((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_self)->_geom;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":158
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":158
* cdef char answer
* g1 = self._geom
* g2 = geom._geom # <<<<<<<<<<<<<<
@@ -564,7 +582,7 @@
*/
__pyx_v_g2 = ((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_geom)->_geom;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":159
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":159
* g1 = self._geom
* g2 = geom._geom
* answer = GEOSIntersects(g1, g2) # <<<<<<<<<<<<<<
@@ -573,7 +591,7 @@
*/
__pyx_v_answer = GEOSIntersects(__pyx_v_g1,__pyx_v_g2);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":160
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":160
* g2 = geom._geom
* answer = GEOSIntersects(g1, g2)
* if answer: # <<<<<<<<<<<<<<
@@ -608,11 +626,11 @@
static PyObject *__pyx_n_append;
static PyObject *__pyx_n_NotImplementedError;
-static PyObject *__pyx_k7p;
+static PyObject *__pyx_k8p;
static PyObject *__pyx_builtin_NotImplementedError;
-static char __pyx_k7[] = "intersections of type '%s' not yet implemented";
+static char __pyx_k8[] = "intersections of type '%s' not yet implemented";
static PyObject *__pyx_pf_5_geos_12BaseGeometry_intersection(PyObject *__pyx_v_self, PyObject *__pyx_v_geom); /*proto*/
static PyObject *__pyx_pf_5_geos_12BaseGeometry_intersection(PyObject *__pyx_v_self, PyObject *__pyx_v_geom) {
@@ -640,7 +658,7 @@
__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 = 165; goto __pyx_L1;}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":169
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":169
* cdef char answer
* cdef int numgeoms, i, typeid
* g1 = self._geom # <<<<<<<<<<<<<<
@@ -649,7 +667,7 @@
*/
__pyx_v_g1 = ((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_self)->_geom;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":170
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":170
* cdef int numgeoms, i, typeid
* g1 = self._geom
* g2 = geom._geom # <<<<<<<<<<<<<<
@@ -658,7 +676,7 @@
*/
__pyx_v_g2 = ((struct __pyx_obj_5_geos_BaseGeometry *)__pyx_v_geom)->_geom;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":171
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":171
* g1 = self._geom
* g2 = geom._geom
* g3 = GEOSIntersection(g1, g2) # <<<<<<<<<<<<<<
@@ -667,7 +685,7 @@
*/
__pyx_v_g3 = GEOSIntersection(__pyx_v_g1,__pyx_v_g2);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":172
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":172
* g2 = geom._geom
* g3 = GEOSIntersection(g1, g2)
* typeid = GEOSGeomTypeId(g3) # <<<<<<<<<<<<<<
@@ -676,7 +694,7 @@
*/
__pyx_v_typeid = GEOSGeomTypeId(__pyx_v_g3);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":173
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":173
* g3 = GEOSIntersection(g1, g2)
* typeid = GEOSGeomTypeId(g3)
* if typeid == GEOS_POLYGON: # <<<<<<<<<<<<<<
@@ -686,7 +704,7 @@
__pyx_1 = (__pyx_v_typeid == GEOS_POLYGON);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":174
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":174
* typeid = GEOSGeomTypeId(g3)
* if typeid == GEOS_POLYGON:
* b = _get_coords(g3) # <<<<<<<<<<<<<<
@@ -698,7 +716,7 @@
__pyx_v_b = __pyx_2;
__pyx_2 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":175
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":175
* if typeid == GEOS_POLYGON:
* b = _get_coords(g3)
* p = Polygon(b) # <<<<<<<<<<<<<<
@@ -714,7 +732,7 @@
__pyx_v_p = __pyx_3;
__pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":176
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":176
* b = _get_coords(g3)
* p = Polygon(b)
* pout = [p] # <<<<<<<<<<<<<<
@@ -732,7 +750,7 @@
__pyx_1 = (__pyx_v_typeid == GEOS_LINESTRING);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":178
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":178
* pout = [p]
* elif typeid == GEOS_LINESTRING:
* b = _get_coords(g3) # <<<<<<<<<<<<<<
@@ -744,7 +762,7 @@
__pyx_v_b = __pyx_3;
__pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":179
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":179
* elif typeid == GEOS_LINESTRING:
* b = _get_coords(g3)
* p = LineString(b) # <<<<<<<<<<<<<<
@@ -760,7 +778,7 @@
__pyx_v_p = __pyx_3;
__pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":180
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":180
* b = _get_coords(g3)
* p = LineString(b)
* pout = [p] # <<<<<<<<<<<<<<
@@ -778,7 +796,7 @@
__pyx_1 = (__pyx_v_typeid == GEOS_MULTIPOLYGON);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":182
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":182
* pout = [p]
* elif typeid == GEOS_MULTIPOLYGON:
* numgeoms = GEOSGetNumGeometries(g3) # <<<<<<<<<<<<<<
@@ -787,7 +805,7 @@
*/
__pyx_v_numgeoms = GEOSGetNumGeometries(__pyx_v_g3);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":183
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":183
* elif typeid == GEOS_MULTIPOLYGON:
* numgeoms = GEOSGetNumGeometries(g3)
* pout = [] # <<<<<<<<<<<<<<
@@ -799,7 +817,7 @@
__pyx_v_pout = __pyx_3;
__pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":184
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":184
* numgeoms = GEOSGetNumGeometries(g3)
* pout = []
* for i from 0 <= i < numgeoms: # <<<<<<<<<<<<<<
@@ -808,7 +826,7 @@
*/
for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_numgeoms; __pyx_v_i++) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":185
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":185
* pout = []
* for i from 0 <= i < numgeoms:
* gout = GEOSGetGeometryN(g3, i) # <<<<<<<<<<<<<<
@@ -817,7 +835,7 @@
*/
__pyx_v_gout = GEOSGetGeometryN(__pyx_v_g3,__pyx_v_i);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":186
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":186
* for i from 0 <= i < numgeoms:
* gout = GEOSGetGeometryN(g3, i)
* b = _get_coords(gout) # <<<<<<<<<<<<<<
@@ -829,7 +847,7 @@
__pyx_v_b = __pyx_2;
__pyx_2 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":187
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":187
* gout = GEOSGetGeometryN(g3, i)
* b = _get_coords(gout)
* p = Polygon(b) # <<<<<<<<<<<<<<
@@ -845,7 +863,7 @@
__pyx_v_p = __pyx_2;
__pyx_2 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":188
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":188
* b = _get_coords(gout)
* p = Polygon(b)
* pout.append(p) # <<<<<<<<<<<<<<
@@ -866,7 +884,7 @@
__pyx_1 = (__pyx_v_typeid == GEOS_MULTILINESTRING);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":190
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":190
* pout.append(p)
* elif typeid == GEOS_MULTILINESTRING:
* numgeoms = GEOSGetNumGeometries(g3) # <<<<<<<<<<<<<<
@@ -875,7 +893,7 @@
*/
__pyx_v_numgeoms = GEOSGetNumGeometries(__pyx_v_g3);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":191
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":191
* elif typeid == GEOS_MULTILINESTRING:
* numgeoms = GEOSGetNumGeometries(g3)
* pout = [] # <<<<<<<<<<<<<<
@@ -887,7 +905,7 @@
__pyx_v_pout = __pyx_3;
__pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":192
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":192
* numgeoms = GEOSGetNumGeometries(g3)
* pout = []
* for i from 0 <= i < numgeoms: # <<<<<<<<<<<<<<
@@ -896,7 +914,7 @@
*/
for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_numgeoms; __pyx_v_i++) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":193
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":193
* pout = []
* for i from 0 <= i < numgeoms:
* gout = GEOSGetGeometryN(g3, i) # <<<<<<<<<<<<<<
@@ -905,7 +923,7 @@
*/
__pyx_v_gout = GEOSGetGeometryN(__pyx_v_g3,__pyx_v_i);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":194
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":194
* for i from 0 <= i < numgeoms:
* gout = GEOSGetGeometryN(g3, i)
* b = _get_coords(gout) # <<<<<<<<<<<<<<
@@ -917,7 +935,7 @@
__pyx_v_b = __pyx_2;
__pyx_2 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":195
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":195
* gout = GEOSGetGeometryN(g3, i)
* b = _get_coords(gout)
* p = LineString(b) # <<<<<<<<<<<<<<
@@ -933,7 +951,7 @@
__pyx_v_p = __pyx_3;
__pyx_3 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":196
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":196
* b = _get_coords(gout)
* p = LineString(b)
* pout.append(p) # <<<<<<<<<<<<<<
@@ -953,7 +971,7 @@
}
/*else*/ {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":198
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":198
* pout.append(p)
* else:
* type = PyString_FromString(GEOSGeomType(g3)) # <<<<<<<<<<<<<<
@@ -965,14 +983,14 @@
__pyx_v_type = __pyx_2;
__pyx_2 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":199
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":199
* else:
* type = PyString_FromString(GEOSGeomType(g3))
* raise NotImplementedError("intersections of type '%s' not yet implemented" % (type)) # <<<<<<<<<<<<<<
* GEOSGeom_destroy(g3)
* return pout
*/
- __pyx_4 = PyNumber_Remainder(__pyx_k7p, __pyx_v_type); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 199; goto __pyx_L1;}
+ __pyx_4 = PyNumber_Remainder(__pyx_k8p, __pyx_v_type); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 199; goto __pyx_L1;}
__pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 199; goto __pyx_L1;}
PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
__pyx_4 = 0;
@@ -984,7 +1002,7 @@
}
__pyx_L2:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":200
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":200
* type = PyString_FromString(GEOSGeomType(g3))
* raise NotImplementedError("intersections of type '%s' not yet implemented" % (type))
* GEOSGeom_destroy(g3) # <<<<<<<<<<<<<<
@@ -993,7 +1011,7 @@
*/
GEOSGeom_destroy(__pyx_v_g3);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":201
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":201
* raise NotImplementedError("intersections of type '%s' not yet implemented" % (type))
* GEOSGeom_destroy(g3)
* return pout # <<<<<<<<<<<<<<
@@ -1118,7 +1136,7 @@
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 = 216; goto __pyx_L1;}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":225
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":225
* # make sure data is contiguous.
* # if not, make a local copy.
* if not PyArray_ISCONTIGUOUS(b): # <<<<<<<<<<<<<<
@@ -1138,7 +1156,7 @@
}
__pyx_L2:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":228
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":228
* b = b.copy()
*
* m = b.shape[0] # <<<<<<<<<<<<<<
@@ -1160,7 +1178,7 @@
Py_DECREF(__pyx_4); __pyx_4 = 0;
__pyx_v_m = __pyx_5;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":231
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":231
*
* # Add closing coordinates to sequence?
* if b[-1,0] != b[0,0] or b[-1,1] != b[0,1]: # <<<<<<<<<<<<<<
@@ -1216,7 +1234,7 @@
}
__pyx_L3:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":235
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":235
* else:
* M = m
* self._npts = M # <<<<<<<<<<<<<<
@@ -1225,7 +1243,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":238
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":238
*
* # Create a coordinate sequence
* cs = GEOSCoordSeq_create(M, 2) # <<<<<<<<<<<<<<
@@ -1234,7 +1252,7 @@
*/
__pyx_v_cs = GEOSCoordSeq_create(__pyx_v_M,2);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":241
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":241
*
* # add to coordinate sequence
* bbuffer = <double *>b.data # <<<<<<<<<<<<<<
@@ -1243,7 +1261,7 @@
*/
__pyx_v_bbuffer = ((double *)__pyx_v_b->data);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":242
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":242
* # add to coordinate sequence
* bbuffer = <double *>b.data
* for i from 0 <= i < m: # <<<<<<<<<<<<<<
@@ -1252,7 +1270,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":243
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":243
* bbuffer = <double *>b.data
* for i from 0 <= i < m:
* dx = bbuffer[2*i] # <<<<<<<<<<<<<<
@@ -1261,7 +1279,7 @@
*/
__pyx_v_dx = (__pyx_v_bbuffer[(2 * __pyx_v_i)]);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":244
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":244
* for i from 0 <= i < m:
* dx = bbuffer[2*i]
* dy = bbuffer[2*i+1] # <<<<<<<<<<<<<<
@@ -1270,7 +1288,7 @@
*/
__pyx_v_dy = (__pyx_v_bbuffer[((2 * __pyx_v_i) + 1)]);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":247
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":247
* # Because of a bug in the GEOS C API,
* # always set X before Y
* GEOSCoordSeq_setX(cs, i, dx) # <<<<<<<<<<<<<<
@@ -1279,7 +1297,7 @@
*/
GEOSCoordSeq_setX(__pyx_v_cs,__pyx_v_i,__pyx_v_dx);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":248
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":248
* # always set X before Y
* GEOSCoordSeq_setX(cs, i, dx)
* GEOSCoordSeq_setY(cs, i, dy) # <<<<<<<<<<<<<<
@@ -1289,7 +1307,7 @@
GEOSCoordSeq_setY(__pyx_v_cs,__pyx_v_i,__pyx_v_dy);
}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":251
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":251
*
* # Add closing coordinates to sequence?
* if M > m: # <<<<<<<<<<<<<<
@@ -1299,7 +1317,7 @@
__pyx_1 = (__pyx_v_M > __pyx_v_m);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":252
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":252
* # Add closing coordinates to sequence?
* if M > m:
* dx = bbuffer[0] # <<<<<<<<<<<<<<
@@ -1308,7 +1326,7 @@
*/
__pyx_v_dx = (__pyx_v_bbuffer[0]);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":253
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":253
* if M > m:
* dx = bbuffer[0]
* dy = bbuffer[1] # <<<<<<<<<<<<<<
@@ -1317,7 +1335,7 @@
*/
__pyx_v_dy = (__pyx_v_bbuffer[1]);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":254
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":254
* dx = bbuffer[0]
* dy = bbuffer[1]
* GEOSCoordSeq_setX(cs, M-1, dx) # <<<<<<<<<<<<<<
@@ -1326,7 +1344,7 @@
*/
GEOSCoordSeq_setX(__pyx_v_cs,(__pyx_v_M - 1),__pyx_v_dx);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":255
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":255
* dy = bbuffer[1]
* GEOSCoordSeq_setX(cs, M-1, dx)
* GEOSCoordSeq_setY(cs, M-1, dy) # <<<<<<<<<<<<<<
@@ -1338,7 +1356,7 @@
}
__pyx_L6:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":258
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":258
*
* # create LinearRing
* lr = GEOSGeom_createLinearRing(cs) # <<<<<<<<<<<<<<
@@ -1347,7 +1365,7 @@
*/
__pyx_v_lr = GEOSGeom_createLinearRing(__pyx_v_cs);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":261
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":261
*
* # create Polygon from LinearRing (assuming no holes)
* self._geom = GEOSGeom_createPolygon(lr,NULL,0) # <<<<<<<<<<<<<<
@@ -1356,7 +1374,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":262
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":262
* # create Polygon from LinearRing (assuming no holes)
* self._geom = GEOSGeom_createPolygon(lr,NULL,0)
* self.boundary = b # <<<<<<<<<<<<<<
@@ -1389,7 +1407,7 @@
PyObject *__pyx_1 = 0;
Py_INCREF((PyObject *)__pyx_v_self);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":267
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":267
* def area(self):
* cdef double area
* GEOSArea(self._geom, &area) # <<<<<<<<<<<<<<
@@ -1398,7 +1416,7 @@
*/
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":268
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":268
* cdef double area
* GEOSArea(self._geom, &area)
* return area # <<<<<<<<<<<<<<
@@ -1442,7 +1460,7 @@
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 = 271; goto __pyx_L1;}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":279
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":279
* # make sure data is contiguous.
* # if not, make a local copy.
* if not PyArray_ISCONTIGUOUS(b): # <<<<<<<<<<<<<<
@@ -1462,7 +1480,7 @@
}
__pyx_L2:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":282
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":282
* b = b.copy()
*
* M = b.shape[0] # <<<<<<<<<<<<<<
@@ -1484,7 +1502,7 @@
Py_DECREF(__pyx_4); __pyx_4 = 0;
__pyx_v_M = __pyx_5;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":283
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":283
*
* M = b.shape[0]
* self._npts = M # <<<<<<<<<<<<<<
@@ -1493,7 +1511,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":286
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":286
*
* # Create a coordinate sequence
* cs = GEOSCoordSeq_create(M, 2) # <<<<<<<<<<<<<<
@@ -1502,7 +1520,7 @@
*/
__pyx_v_cs = GEOSCoordSeq_create(__pyx_v_M,2);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":289
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":289
*
* # add to coordinate sequence
* bbuffer = <double *>b.data # <<<<<<<<<<<<<<
@@ -1511,7 +1529,7 @@
*/
__pyx_v_bbuffer = ((double *)__pyx_v_b->data);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":290
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":290
* # add to coordinate sequence
* bbuffer = <double *>b.data
* for i from 0 <= i < M: # <<<<<<<<<<<<<<
@@ -1520,7 +1538,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":291
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":291
* bbuffer = <double *>b.data
* for i from 0 <= i < M:
* dx = bbuffer[2*i] # <<<<<<<<<<<<<<
@@ -1529,7 +1547,7 @@
*/
__pyx_v_dx = (__pyx_v_bbuffer[(2 * __pyx_v_i)]);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":292
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":292
* for i from 0 <= i < M:
* dx = bbuffer[2*i]
* dy = bbuffer[2*i+1] # <<<<<<<<<<<<<<
@@ -1538,7 +1556,7 @@
*/
__pyx_v_dy = (__pyx_v_bbuffer[((2 * __pyx_v_i) + 1)]);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":295
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":295
* # Because of a bug in the GEOS C API,
* # always set X before Y
* GEOSCoordSeq_setX(cs, i, dx) # <<<<<<<<<<<<<<
@@ -1547,7 +1565,7 @@
*/
GEOSCoordSeq_setX(__pyx_v_cs,__pyx_v_i,__pyx_v_dx);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":296
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":296
* # always set X before Y
* GEOSCoordSeq_setX(cs, i, dx)
* GEOSCoordSeq_setY(cs, i, dy) # <<<<<<<<<<<<<<
@@ -1557,7 +1575,7 @@
GEOSCoordSeq_setY(__pyx_v_cs,__pyx_v_i,__pyx_v_dy);
}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":299
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":299
*
* # create LineString
* self._geom = GEOSGeom_createLineString(cs) # <<<<<<<<<<<<<<
@@ -1566,7 +1584,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":300
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":300
* # create LineString
* self._geom = GEOSGeom_createLineString(cs)
* self.boundary = b # <<<<<<<<<<<<<<
@@ -1606,7 +1624,7 @@
Py_INCREF((PyObject *)__pyx_v_self);
Py_INCREF(__pyx_v_b);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":308
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":308
* cdef GEOSCoordSeq *cs
* # Create a coordinate sequence
* cs = GEOSCoordSeq_create(1, 2) # <<<<<<<<<<<<<<
@@ -1615,7 +1633,7 @@
*/
__pyx_v_cs = GEOSCoordSeq_create(1,2);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":309
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":309
* # Create a coordinate sequence
* cs = GEOSCoordSeq_create(1, 2)
* dx = b[0]; dy = b[1] # <<<<<<<<<<<<<<
@@ -1635,7 +1653,7 @@
Py_DECREF(__pyx_2); __pyx_2 = 0;
__pyx_v_dx = __pyx_3;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":309
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":309
* # Create a coordinate sequence
* cs = GEOSCoordSeq_create(1, 2)
* dx = b[0]; dy = b[1] # <<<<<<<<<<<<<<
@@ -1655,7 +1673,7 @@
Py_DECREF(__pyx_2); __pyx_2 = 0;
__pyx_v_dy = __pyx_3;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":310
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":310
* cs = GEOSCoordSeq_create(1, 2)
* dx = b[0]; dy = b[1]
* GEOSCoordSeq_setX(cs, 0, dx) # <<<<<<<<<<<<<<
@@ -1664,7 +1682,7 @@
*/
GEOSCoordSeq_setX(__pyx_v_cs,0,__pyx_v_dx);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":311
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":311
* dx = b[0]; dy = b[1]
* GEOSCoordSeq_setX(cs, 0, dx)
* GEOSCoordSeq_setY(cs, 0, dy) # <<<<<<<<<<<<<<
@@ -1673,7 +1691,7 @@
*/
GEOSCoordSeq_setY(__pyx_v_cs,0,__pyx_v_dy);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":312
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":312
* GEOSCoordSeq_setX(cs, 0, dx)
* GEOSCoordSeq_setY(cs, 0, dy)
* self._geom = GEOSGeom_createPoint(cs) # <<<<<<<<<<<<<<
@@ -1682,7 +1700,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":313
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":313
* GEOSCoordSeq_setY(cs, 0, dy)
* self._geom = GEOSGeom_createPoint(cs)
* self._npts = 1 # <<<<<<<<<<<<<<
@@ -1691,7 +1709,7 @@
*/
((struct __pyx_obj_5_geos_Point *)__pyx_v_self)->__pyx_base._npts = 1;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":314
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":314
* self._geom = GEOSGeom_createPoint(cs)
* self._npts = 1
* self.boundary = b # <<<<<<<<<<<<<<
@@ -1715,6 +1733,8 @@
return __pyx_r;
}
+static PyObject *__pyx_num_2;
+
static PyObject *__pyx_n_empty;
static PyObject *__pyx_n_float64;
@@ -1735,7 +1755,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":323
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":323
* cdef ndarray b
* cdef double *bbuffer
* if GEOSGeomTypeId(geom) == GEOS_POLYGON: # <<<<<<<<<<<<<<
@@ -1745,7 +1765,7 @@
__pyx_1 = (GEOSGeomTypeId(__pyx_v_geom) == GEOS_POLYGON);
if (__pyx_1) {
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":324
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":324
* cdef double *bbuffer
* if GEOSGeomTypeId(geom) == GEOS_POLYGON:
* lr = GEOSGetExteriorRing(geom) # <<<<<<<<<<<<<<
@@ -1754,7 +1774,7 @@
*/
__pyx_v_lr = GEOSGetExteriorRing(__pyx_v_geom);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":325
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":325
* if GEOSGeomTypeId(geom) == GEOS_POLYGON:
* lr = GEOSGetExteriorRing(geom)
* cs = GEOSGeom_getCoordSeq(lr) # <<<<<<<<<<<<<<
@@ -1769,7 +1789,7 @@
}
__pyx_L2:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":328
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":328
* else:
* cs = GEOSGeom_getCoordSeq(geom)
* GEOSCoordSeq_getSize(cs, &M) # <<<<<<<<<<<<<<
@@ -1778,7 +1798,7 @@
*/
GEOSCoordSeq_getSize(__pyx_v_cs,(&__pyx_v_M));
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":329
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":329
* cs = GEOSGeom_getCoordSeq(geom)
* GEOSCoordSeq_getSize(cs, &M)
* b = numpy.empty((M,2), numpy.float64) # <<<<<<<<<<<<<<
@@ -1810,7 +1830,7 @@
__pyx_v_b = ((PyArrayObject *)__pyx_4);
__pyx_4 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":330
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":330
* GEOSCoordSeq_getSize(cs, &M)
* b = numpy.empty((M,2), numpy.float64)
* bbuffer = <double *>b.data # <<<<<<<<<<<<<<
@@ -1819,7 +1839,7 @@
*/
__pyx_v_bbuffer = ((double *)__pyx_v_b->data);
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":331
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":331
* b = numpy.empty((M,2), numpy.float64)
* bbuffer = <double *>b.data
* for i from 0 <= i < M: # <<<<<<<<<<<<<<
@@ -1828,7 +1848,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":332
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":332
* bbuffer = <double *>b.data
* for i from 0 <= i < M:
* GEOSCoordSeq_getX(cs, i, &dx) # <<<<<<<<<<<<<<
@@ -1837,7 +1857,7 @@
*/
GEOSCoordSeq_getX(__pyx_v_cs,__pyx_v_i,(&__pyx_v_dx));
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":333
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":333
* for i from 0 <= i < M:
* GEOSCoordSeq_getX(cs, i, &dx)
* GEOSCoordSeq_getY(cs, i, &dy) # <<<<<<<<<<<<<<
@@ -1846,7 +1866,7 @@
*/
GEOSCoordSeq_getY(__pyx_v_cs,__pyx_v_i,(&__pyx_v_dy));
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":334
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":334
* GEOSCoordSeq_getX(cs, i, &dx)
* GEOSCoordSeq_getY(cs, i, &dy)
* bbuffer[2*i] = dx # <<<<<<<<<<<<<<
@@ -1855,7 +1875,7 @@
*/
(__pyx_v_bbuffer[(2 * __pyx_v_i)]) = __pyx_v_dx;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":335
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":335
* GEOSCoordSeq_getY(cs, i, &dy)
* bbuffer[2*i] = dx
* bbuffer[2*i+1] = dy # <<<<<<<<<<<<<<
@@ -1864,7 +1884,7 @@
(__pyx_v_bbuffer[((2 * __pyx_v_i) + 1)]) = __pyx_v_dy;
}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":336
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":336
* bbuffer[2*i] = dx
* bbuffer[2*i+1] = dy
* return b # <<<<<<<<<<<<<<
@@ -1892,6 +1912,7 @@
{&__pyx_n_ValueError, "ValueError"},
{&__pyx_n___class__, "__class__"},
{&__pyx_n___dealloc__, "__dealloc__"},
+ {&__pyx_n___geos_version__, "__geos_version__"},
{&__pyx_n___init__, "__init__"},
{&__pyx_n___reduce__, "__reduce__"},
{&__pyx_n___version__, "__version__"},
@@ -1901,7 +1922,6 @@
{&__pyx_n_empty, "empty"},
{&__pyx_n_float64, "float64"},
{&__pyx_n_geom_type, "geom_type"},
- {&__pyx_n_geos_version, "geos_version"},
{&__pyx_n_get_coords, "get_coords"},
{&__pyx_n_intersection, "intersection"},
{&__pyx_n_intersects, "intersects"},
@@ -1922,6 +1942,7 @@
{&__pyx_k5p, __pyx_k5, sizeof(__pyx_k5), 0},
{&__pyx_k6p, __pyx_k6, sizeof(__pyx_k6), 0},
{&__pyx_k7p, __pyx_k7, sizeof(__pyx_k7), 0},
+ {&__pyx_k8p, __pyx_k8, sizeof(__pyx_k8), 0},
{0, 0, 0, 0}
};
@@ -2568,9 +2589,7 @@
PyMODINIT_FUNC init_geos(void) {
PyObject *__pyx_1 = 0;
PyObject *__pyx_2 = 0;
- PyObject *__pyx_3 = 0;
- PyObject *__pyx_4 = 0;
- int __pyx_5;
+ int __pyx_3;
/*--- Libary function declarations ---*/
__pyx_init_filenames();
/*--- Module creation code ---*/
@@ -2580,11 +2599,10 @@
if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
/*--- Intern code ---*/
- __pyx_num_2 = PyInt_FromLong(2); if (unlikely(!__pyx_num_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
- __pyx_num_3 = PyInt_FromLong(3); if (unlikely(!__pyx_num_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
__pyx_num_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_num_neg_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
__pyx_num_0 = PyInt_FromLong(0); if (unlikely(!__pyx_num_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
__pyx_num_1 = PyInt_FromLong(1); if (unlikely(!__pyx_num_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
+ __pyx_num_2 = PyInt_FromLong(2); if (unlikely(!__pyx_num_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
if (__Pyx_InternStrings(__pyx_intern_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
/*--- String init code ---*/
if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
@@ -2616,7 +2634,7 @@
/*--- Type import code ---*/
/*--- Execution code ---*/
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":1
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":1
* import sys # <<<<<<<<<<<<<<
* import numpy
*
@@ -2625,7 +2643,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_n_sys, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":2
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":2
* import sys
* import numpy # <<<<<<<<<<<<<<
*
@@ -2635,7 +2653,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_n_numpy, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":4
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":4
* import numpy
*
* __version__ = "0.1" # <<<<<<<<<<<<<<
@@ -2644,7 +2662,7 @@
*/
if (PyObject_SetAttr(__pyx_m, __pyx_n___version__, __pyx_k3p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; goto __pyx_L1;}
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":26
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":26
*
* # Initialize numpy
* import_array() # <<<<<<<<<<<<<<
@@ -2653,60 +2671,43 @@
*/
import_array();
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":121
- *
- * # check library version
- * geos_version = GEOS_VERSION_MAJOR,GEOS_VERSION_MINOR,GEOS_VERSION_PATCH # <<<<<<<<<<<<<<
- * if geos_version != (2,2,3):
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":121
+ * cdef geos_version():
+ * return PyString_FromString(GEOSversion())
+ * __geos_version__ = geos_version() # module variable. # <<<<<<<<<<<<<<
+ * if __geos_version__ != "2.2.3-CAPI-1.1.1":
* raise ValueError('version 2.2.3 of the geos library is required')
*/
- __pyx_1 = PyInt_FromLong(GEOS_VERSION_MAJOR); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
- __pyx_2 = PyInt_FromLong(GEOS_VERSION_MINOR); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
- __pyx_3 = PyInt_FromLong(GEOS_VERSION_PATCH); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
- __pyx_4 = PyTuple_New(3); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
- PyTuple_SET_ITEM(__pyx_4, 0, __pyx_1);
- PyTuple_SET_ITEM(__pyx_4, 1, __pyx_2);
- PyTuple_SET_ITEM(__pyx_4, 2, __pyx_3);
- __pyx_1 = 0;
- __pyx_2 = 0;
- __pyx_3 = 0;
- if (PyObject_SetAttr(__pyx_m, __pyx_n_geos_version, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
- Py_DECREF(__pyx_4); __pyx_4 = 0;
+ __pyx_1 = __pyx_f_5_geos_geos_version(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
+ if (PyObject_SetAttr(__pyx_m, __pyx_n___geos_version__, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
+ Py_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":122
- * # check library version
- * geos_version = GEOS_VERSION_MAJOR,GEOS_VERSION_MINOR,GEOS_VERSION_PATCH
- * if geos_version != (2,2,3): # <<<<<<<<<<<<<<
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":122
+ * return PyString_FromString(GEOSversion())
+ * __geos_version__ = geos_version() # module variable.
+ * if __geos_version__ != "2.2.3-CAPI-1.1.1": # <<<<<<<<<<<<<<
* raise ValueError('version 2.2.3 of the geos library is required')
* # intialize GEOS (parameters are notice and error function callbacks).
*/
- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_geos_version); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
- __pyx_2 = PyTuple_New(3); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
- Py_INCREF(__pyx_num_2);
- PyTuple_SET_ITEM(__pyx_2, 0, __pyx_num_2);
- Py_INCREF(__pyx_num_2);
- PyTuple_SET_ITEM(__pyx_2, 1, __pyx_num_2);
- Py_INCREF(__pyx_num_3);
- PyTuple_SET_ITEM(__pyx_2, 2, __pyx_num_3);
- __pyx_3 = PyObject_RichCompare(__pyx_1, __pyx_2, Py_NE); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___geos_version__); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
+ __pyx_2 = PyObject_RichCompare(__pyx_1, __pyx_k4p, Py_NE); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
+ __pyx_3 = __Pyx_PyObject_IsTrue(__pyx_2); if (unlikely(__pyx_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
Py_DECREF(__pyx_2); __pyx_2 = 0;
- __pyx_5 = __Pyx_PyObject_IsTrue(__pyx_3); if (unlikely(__pyx_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;}
- Py_DECREF(__pyx_3); __pyx_3 = 0;
- if (__pyx_5) {
- __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; goto __pyx_L1;}
- Py_INCREF(__pyx_k4p);
- PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k4p);
- __pyx_1 = PyObject_CallObject(__pyx_builtin_ValueError, __pyx_4); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; goto __pyx_L1;}
- Py_DECREF(__pyx_4); __pyx_4 = 0;
- __Pyx_Raise(__pyx_1, 0, 0);
+ if (__pyx_3) {
+ __pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; goto __pyx_L1;}
+ Py_INCREF(__pyx_k5p);
+ PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k5p);
+ __pyx_2 = PyObject_CallObject(__pyx_builtin_ValueError, __pyx_1); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
+ __Pyx_Raise(__pyx_2, 0, 0);
+ Py_DECREF(__pyx_2); __pyx_2 = 0;
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; goto __pyx_L1;}
goto __pyx_L5;
}
__pyx_L5:;
- /* "/Users/jsw/python/matplotlib/toolkits/basemap-testing/src/_geos.pyx":125
+ /* "/Volumes/User/jwhitaker/matplotlib/basemap-testing/src/_geos.pyx":125
* raise ValueError('version 2.2.3 of the geos library is required')
* # intialize GEOS (parameters are notice and error function callbacks...
[truncated message content] |
