|
 |
471cc6c |
diff -ur basemap-0.99/src/_geoslib.c basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.c
|
|
|
471cc6c |
--- basemap-0.99/src/_geoslib.c 2008-05-31 16:47:47.000000000 +0200
|
|
|
471cc6c |
+++ basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.c 2008-10-23 03:39:39.000000000 +0200
|
|
|
471cc6c |
@@ -202,8 +202,8 @@
|
|
|
471cc6c |
/* Implementation of _geoslib */
|
|
|
471cc6c |
|
|
|
471cc6c |
static char __pyx_k_3[] = "0.1";
|
|
|
471cc6c |
-static char __pyx_k_4[] = "2.2.3-CAPI-1.1.1";
|
|
|
471cc6c |
-static char __pyx_k_5[] = "version 2.2.3 of the geos library is required";
|
|
|
471cc6c |
+static char __pyx_k_4[] = "3.0.1-CAPI-1.4.2";
|
|
|
471cc6c |
+static char __pyx_k_5[] = "version 3.0.1 of the geos library is required";
|
|
|
471cc6c |
|
|
|
471cc6c |
static PyObject *__pyx_n_is_valid;
|
|
|
471cc6c |
static PyObject *__pyx_n_geom_type;
|
|
|
471cc6c |
@@ -515,7 +515,7 @@
|
|
|
471cc6c |
* cdef geos_version():
|
|
|
471cc6c |
* return PyString_FromString(GEOSversion()) # <<<<<<<<<<<<<<
|
|
|
471cc6c |
* __geos_version__ = geos_version() # module variable.
|
|
|
471cc6c |
- * if __geos_version__ != "2.2.3-CAPI-1.1.1":
|
|
|
471cc6c |
+ * if __geos_version__ != "3.0.1-CAPI-1.4.2":
|
|
|
471cc6c |
*/
|
|
|
471cc6c |
__pyx_1 = PyString_FromString(GEOSversion()); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1;}
|
|
|
471cc6c |
__pyx_r = __pyx_1;
|
|
|
471cc6c |
@@ -2988,8 +2988,8 @@
|
|
|
471cc6c |
* cdef geos_version():
|
|
|
471cc6c |
* return PyString_FromString(GEOSversion())
|
|
|
471cc6c |
* __geos_version__ = geos_version() # module variable. # <<<<<<<<<<<<<<
|
|
|
471cc6c |
- * if __geos_version__ != "2.2.3-CAPI-1.1.1":
|
|
|
471cc6c |
- * raise ValueError('version 2.2.3 of the geos library is required')
|
|
|
471cc6c |
+ * if __geos_version__ != "3.0.1-CAPI-1.4.2":
|
|
|
471cc6c |
+ * raise ValueError('version 3.0.1 of the geos library is required')
|
|
|
471cc6c |
*/
|
|
|
471cc6c |
__pyx_1 = __pyx_f_8_geoslib_geos_version(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;}
|
|
|
471cc6c |
if (PyObject_SetAttr(__pyx_m, __pyx_n___geos_version__, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;}
|
|
|
471cc6c |
@@ -2998,8 +2998,8 @@
|
|
|
471cc6c |
/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geoslib.pyx":122
|
|
|
471cc6c |
* return PyString_FromString(GEOSversion())
|
|
|
471cc6c |
* __geos_version__ = geos_version() # module variable.
|
|
|
471cc6c |
- * if __geos_version__ != "2.2.3-CAPI-1.1.1": # <<<<<<<<<<<<<<
|
|
|
471cc6c |
- * raise ValueError('version 2.2.3 of the geos library is required')
|
|
|
471cc6c |
+ * if __geos_version__ != "3.0.1-CAPI-1.4.2": # <<<<<<<<<<<<<<
|
|
|
471cc6c |
+ * raise ValueError('version 3.0.1 of the geos library is required')
|
|
|
471cc6c |
* # intialize GEOS (parameters are notice and error function callbacks).
|
|
|
471cc6c |
*/
|
|
|
471cc6c |
__pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___geos_version__); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1;}
|
|
|
471cc6c |
@@ -3011,8 +3011,8 @@
|
|
|
471cc6c |
|
|
|
471cc6c |
/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geoslib.pyx":123
|
|
|
471cc6c |
* __geos_version__ = geos_version() # module variable.
|
|
|
471cc6c |
- * if __geos_version__ != "2.2.3-CAPI-1.1.1":
|
|
|
471cc6c |
- * raise ValueError('version 2.2.3 of the geos library is required') # <<<<<<<<<<<<<<
|
|
|
471cc6c |
+ * if __geos_version__ != "3.0.1-CAPI-1.4.2":
|
|
|
471cc6c |
+ * raise ValueError('version 3.0.1 of the geos library is required') # <<<<<<<<<<<<<<
|
|
|
471cc6c |
* # intialize GEOS (parameters are notice and error function callbacks).
|
|
|
471cc6c |
* initGEOS(notice_h, error_h)
|
|
|
471cc6c |
*/
|
|
|
471cc6c |
@@ -3029,7 +3029,7 @@
|
|
|
471cc6c |
__pyx_L5:;
|
|
|
471cc6c |
|
|
|
471cc6c |
/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geoslib.pyx":125
|
|
|
471cc6c |
- * raise ValueError('version 2.2.3 of the geos library is required')
|
|
|
471cc6c |
+ * raise ValueError('version 3.0.1 of the geos library is required')
|
|
|
471cc6c |
* # intialize GEOS (parameters are notice and error function callbacks).
|
|
|
471cc6c |
* initGEOS(notice_h, error_h) # <<<<<<<<<<<<<<
|
|
|
471cc6c |
*
|
|
|
471cc6c |
diff -ur basemap-0.99/src/_geoslib.pyx basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.pyx
|
|
|
471cc6c |
--- basemap-0.99/src/_geoslib.pyx 2008-05-31 16:47:47.000000000 +0200
|
|
|
471cc6c |
+++ basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.pyx 2008-10-23 03:38:50.000000000 +0200
|
|
|
471cc6c |
@@ -119,8 +119,8 @@
|
|
|
471cc6c |
cdef geos_version():
|
|
|
471cc6c |
return PyString_FromString(GEOSversion())
|
|
|
471cc6c |
__geos_version__ = geos_version() # module variable.
|
|
|
471cc6c |
-if __geos_version__ != "2.2.3-CAPI-1.1.1":
|
|
|
471cc6c |
- raise ValueError('version 2.2.3 of the geos library is required')
|
|
|
471cc6c |
+if __geos_version__ != "3.0.1-CAPI-1.4.2":
|
|
|
471cc6c |
+ raise ValueError('version 3.0.1 of the geos library is required')
|
|
|
471cc6c |
# intialize GEOS (parameters are notice and error function callbacks).
|
|
|
471cc6c |
initGEOS(notice_h, error_h)
|
|
|
471cc6c |
|