Menu
▾
▴
SF.net SVN: matplotlib: [3940] trunk/toolkits/basemap/src
|
From: <js...@us...> - 2007-10-14 14:16:55
|
Revision: 3940
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3940&view=rev
Author: jswhit
Date: 2007-10-14 07:16:48 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
regenerated with cython 0.9.6.7
Modified Paths:
--------------
trunk/toolkits/basemap/src/_geod.c
trunk/toolkits/basemap/src/_proj.c
Modified: trunk/toolkits/basemap/src/_geod.c
===================================================================
--- trunk/toolkits/basemap/src/_geod.c 2007-10-12 17:30:17 UTC (rev 3939)
+++ trunk/toolkits/basemap/src/_geod.c 2007-10-14 14:16:48 UTC (rev 3940)
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.9.6.6 on Wed Sep 12 12:20:59 2007 */
+/* Generated by Cython 0.9.6.7 on Sun Oct 14 08:16:22 2007 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -37,7 +37,7 @@
typedef struct {const char *s; const void **p;} __Pyx_CApiTabEntry; /*proto*/
typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/
-typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/
+typedef struct {PyObject **p; char *s; long n; int is_unicode;} __Pyx_StringTabEntry; /*proto*/
#define __pyx_PyIndex_AsSsize_t(b) PyInt_AsSsize_t(PyNumber_Index(b))
@@ -110,6 +110,11 @@
static PyObject *__pyx_n__rad2dg;
static PyObject *__pyx_n__doublesize;
static PyObject *__pyx_n___version__;
+static PyObject *__pyx_n___new__;
+static PyObject *__pyx_n___reduce__;
+static PyObject *__pyx_n__fwd;
+static PyObject *__pyx_n__inv;
+static PyObject *__pyx_n__npts;
static PyObject *__pyx_n_radians;
static PyObject *__pyx_n_degrees;
@@ -132,8 +137,8 @@
static char (__pyx_k8[]) = " ";
static char (__pyx_k9[]) = "";
-static int __pyx_f_5_geod_4Geod___new__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
-static int __pyx_f_5_geod_4Geod___new__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+static int __pyx_f_py_5_geod_4Geod___new__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static int __pyx_f_py_5_geod_4Geod___new__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
PyObject *__pyx_v_geodparams = 0;
GEODESIC_T __pyx_v_GEOD_T;
PyObject *__pyx_v_geodargs;
@@ -155,7 +160,7 @@
__pyx_v_key = Py_None; Py_INCREF(Py_None);
__pyx_v_value = Py_None; Py_INCREF(Py_None);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":13
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":13
* def __new__(self, geodparams):
* cdef GEODESIC_T GEOD_T
* self.geodparams = geodparams # <<<<<<<<<<<<<<
@@ -166,7 +171,7 @@
Py_DECREF(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodparams);
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodparams = __pyx_v_geodparams;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":15
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":15
* self.geodparams = geodparams
* # setup proj initialization string.
* geodargs = [] # <<<<<<<<<<<<<<
@@ -178,7 +183,7 @@
__pyx_v_geodargs = __pyx_1;
__pyx_1 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":16
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":16
* # setup proj initialization string.
* geodargs = []
* for key,value in geodparams.iteritems(): # <<<<<<<<<<<<<<
@@ -227,7 +232,7 @@
Py_DECREF(__pyx_4); __pyx_4 = 0;
}
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":17
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":17
* geodargs = []
* for key,value in geodparams.iteritems():
* geodargs.append('+'+key+"="+str(value)+' ') # <<<<<<<<<<<<<<
@@ -258,7 +263,7 @@
}
Py_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":18
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":18
* for key,value in geodparams.iteritems():
* geodargs.append('+'+key+"="+str(value)+' ')
* self.geodinitstring = PyString_AsString(''.join(geodargs)) # <<<<<<<<<<<<<<
@@ -275,7 +280,7 @@
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodinitstring = PyString_AsString(__pyx_6);
Py_DECREF(__pyx_6); __pyx_6 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":20
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":20
* self.geodinitstring = PyString_AsString(''.join(geodargs))
* # initialize projection
* self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0] # <<<<<<<<<<<<<<
@@ -284,7 +289,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t = (GEOD_init_plus(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodinitstring,(&__pyx_v_GEOD_T))[0]);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":21
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":21
* # initialize projection
* self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0]
* if pj_errno != 0: # <<<<<<<<<<<<<<
@@ -294,7 +299,7 @@
__pyx_7 = (pj_errno != 0);
if (__pyx_7) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":22
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":22
* self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0]
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno)) # <<<<<<<<<<<<<<
@@ -314,7 +319,7 @@
}
__pyx_L4:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":23
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":23
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno))
* self.proj_version = PJ_VERSION/100. # <<<<<<<<<<<<<<
@@ -347,16 +352,16 @@
static PyObject *__pyx_n___class__;
-static PyObject *__pyx_f_5_geod_4Geod___reduce__(PyObject *__pyx_v_self, PyObject *unused); /*proto*/
+static PyObject *__pyx_f_py_5_geod_4Geod___reduce__(PyObject *__pyx_v_self, PyObject *unused); /*proto*/
static char __pyx_doc_5_geod_4Geod___reduce__[] = "special method that allows pyproj.Geod instance to be pickled";
-static PyObject *__pyx_f_5_geod_4Geod___reduce__(PyObject *__pyx_v_self, PyObject *unused) {
+static PyObject *__pyx_f_py_5_geod_4Geod___reduce__(PyObject *__pyx_v_self, PyObject *unused) {
PyObject *__pyx_r;
PyObject *__pyx_1 = 0;
PyObject *__pyx_2 = 0;
PyObject *__pyx_3 = 0;
Py_INCREF(__pyx_v_self);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":27
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":27
* def __reduce__(self):
* """special method that allows pyproj.Geod instance to be pickled"""
* return (self.__class__,(self.geodparams,)) # <<<<<<<<<<<<<<
@@ -399,9 +404,9 @@
static char (__pyx_k10[]) = "Buffer lengths not the same";
static char (__pyx_k11[]) = "undefined forward geodesic (may be an equatorial arc)";
-static PyObject *__pyx_f_5_geod_4Geod__fwd(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static PyObject *__pyx_f_py_5_geod_4Geod__fwd(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
static char __pyx_doc_5_geod_4Geod__fwd[] = "\n forward transformation - determine longitude, latitude and back azimuth \n of a terminus point given an initial point longitude and latitude, plus\n forward azimuth and distance.\n if radians=True, lons/lats are radians instead of degrees.\n ";
-static PyObject *__pyx_f_5_geod_4Geod__fwd(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+static PyObject *__pyx_f_py_5_geod_4Geod__fwd(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
PyObject *__pyx_v_lons = 0;
PyObject *__pyx_v_lats = 0;
PyObject *__pyx_v_az = 0;
@@ -440,7 +445,7 @@
Py_INCREF(__pyx_v_dist);
Py_INCREF(__pyx_v_radians);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":40
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":40
* cdef void *londata, *latdata, *azdat, *distdat
* # if buffer api is supported, get pointer to data buffers.
* if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0: # <<<<<<<<<<<<<<
@@ -450,7 +455,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lons,(&__pyx_v_londata),(&__pyx_v_buflenlons)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":41
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":41
* # if buffer api is supported, get pointer to data buffers.
* if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -463,7 +468,7 @@
}
__pyx_L2:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":42
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":42
* if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0: # <<<<<<<<<<<<<<
@@ -473,7 +478,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lats,(&__pyx_v_latdata),(&__pyx_v_buflenlats)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":43
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":43
* raise RuntimeError
* if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -486,7 +491,7 @@
}
__pyx_L3:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":44
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":44
* if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0: # <<<<<<<<<<<<<<
@@ -496,7 +501,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_az,(&__pyx_v_azdat),(&__pyx_v_buflenaz)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":45
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":45
* raise RuntimeError
* if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -509,7 +514,7 @@
}
__pyx_L4:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":46
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":46
* if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(dist, &distdat, &buflend) <> 0: # <<<<<<<<<<<<<<
@@ -519,7 +524,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_dist,(&__pyx_v_distdat),(&__pyx_v_buflend)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":47
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":47
* raise RuntimeError
* if PyObject_AsWriteBuffer(dist, &distdat, &buflend) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -532,24 +537,24 @@
}
__pyx_L5:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":49
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":49
* raise RuntimeError
* # process data in buffer
* if not buflenlons == buflenlats == buflenaz == buflend: # <<<<<<<<<<<<<<
* raise RuntimeError("Buffer lengths not the same")
* ndim = buflenlons/_doublesize
*/
- __pyx_1 = __pyx_v_buflenlons == __pyx_v_buflenlats;
+ __pyx_1 = (__pyx_v_buflenlons == __pyx_v_buflenlats);
if (__pyx_1) {
- __pyx_1 = __pyx_v_buflenlats == __pyx_v_buflenaz;
+ __pyx_1 = (__pyx_v_buflenlats == __pyx_v_buflenaz);
if (__pyx_1) {
- __pyx_1 = __pyx_v_buflenaz == __pyx_v_buflend;
+ __pyx_1 = (__pyx_v_buflenaz == __pyx_v_buflend);
}
}
__pyx_2 = (!__pyx_1);
if (__pyx_2) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":50
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":50
* # process data in buffer
* if not buflenlons == buflenlats == buflenaz == buflend:
* raise RuntimeError("Buffer lengths not the same") # <<<<<<<<<<<<<<
@@ -568,7 +573,7 @@
}
__pyx_L6:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":51
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":51
* if not buflenlons == buflenlats == buflenaz == buflend:
* raise RuntimeError("Buffer lengths not the same")
* ndim = buflenlons/_doublesize # <<<<<<<<<<<<<<
@@ -584,7 +589,7 @@
Py_DECREF(__pyx_5); __pyx_5 = 0;
__pyx_v_ndim = __pyx_6;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":52
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":52
* raise RuntimeError("Buffer lengths not the same")
* ndim = buflenlons/_doublesize
* lonsdata = <double *>londata # <<<<<<<<<<<<<<
@@ -593,7 +598,7 @@
*/
__pyx_v_lonsdata = ((double (*))__pyx_v_londata);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":53
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":53
* ndim = buflenlons/_doublesize
* lonsdata = <double *>londata
* latsdata = <double *>latdata # <<<<<<<<<<<<<<
@@ -602,7 +607,7 @@
*/
__pyx_v_latsdata = ((double (*))__pyx_v_latdata);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":54
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":54
* lonsdata = <double *>londata
* latsdata = <double *>latdata
* azdata = <double *>azdat # <<<<<<<<<<<<<<
@@ -611,7 +616,7 @@
*/
__pyx_v_azdata = ((double (*))__pyx_v_azdat);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":55
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":55
* latsdata = <double *>latdata
* azdata = <double *>azdat
* distdata = <double *>distdat # <<<<<<<<<<<<<<
@@ -620,7 +625,7 @@
*/
__pyx_v_distdata = ((double (*))__pyx_v_distdat);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":56
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":56
* azdata = <double *>azdat
* distdata = <double *>distdat
* for i from 0 <= i < ndim: # <<<<<<<<<<<<<<
@@ -629,17 +634,17 @@
*/
for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_ndim; __pyx_v_i++) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":57
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":57
* distdata = <double *>distdat
* for i from 0 <= i < ndim:
* if radians: # <<<<<<<<<<<<<<
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i]
*/
- __pyx_1 = PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; goto __pyx_L1;}
+ __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; goto __pyx_L1;}
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":58
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":58
* for i from 0 <= i < ndim:
* if radians:
* self.geodesic_t.p1.v = lonsdata[i] # <<<<<<<<<<<<<<
@@ -648,7 +653,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = (__pyx_v_lonsdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":59
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":59
* if radians:
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i] # <<<<<<<<<<<<<<
@@ -657,7 +662,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = (__pyx_v_latsdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":60
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":60
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i]
* self.geodesic_t.ALPHA12 = azdata[i] # <<<<<<<<<<<<<<
@@ -666,7 +671,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12 = (__pyx_v_azdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":61
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":61
* self.geodesic_t.p1.u = latsdata[i]
* self.geodesic_t.ALPHA12 = azdata[i]
* self.geodesic_t.DIST = distdata[i] # <<<<<<<<<<<<<<
@@ -678,7 +683,7 @@
}
/*else*/ {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":63
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":63
* self.geodesic_t.DIST = distdata[i]
* else:
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i] # <<<<<<<<<<<<<<
@@ -694,7 +699,7 @@
Py_DECREF(__pyx_5); __pyx_5 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_7;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":64
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":64
* else:
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
* self.geodesic_t.p1.u = _dg2rad*latsdata[i] # <<<<<<<<<<<<<<
@@ -710,7 +715,7 @@
Py_DECREF(__pyx_5); __pyx_5 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_7;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":65
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":65
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
* self.geodesic_t.p1.u = _dg2rad*latsdata[i]
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i] # <<<<<<<<<<<<<<
@@ -726,7 +731,7 @@
Py_DECREF(__pyx_5); __pyx_5 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12 = __pyx_7;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":66
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":66
* self.geodesic_t.p1.u = _dg2rad*latsdata[i]
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
* self.geodesic_t.DIST = distdata[i] # <<<<<<<<<<<<<<
@@ -737,7 +742,7 @@
}
__pyx_L9:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":67
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":67
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
* self.geodesic_t.DIST = distdata[i]
* geod_pre(&self.geodesic_t) # <<<<<<<<<<<<<<
@@ -746,7 +751,7 @@
*/
geod_pre((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":68
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":68
* self.geodesic_t.DIST = distdata[i]
* geod_pre(&self.geodesic_t)
* if pj_errno != 0: # <<<<<<<<<<<<<<
@@ -756,7 +761,7 @@
__pyx_2 = (pj_errno != 0);
if (__pyx_2) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":69
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":69
* geod_pre(&self.geodesic_t)
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno)) # <<<<<<<<<<<<<<
@@ -776,7 +781,7 @@
}
__pyx_L10:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":70
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":70
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno))
* geod_for(&self.geodesic_t) # <<<<<<<<<<<<<<
@@ -785,7 +790,7 @@
*/
geod_for((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":71
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":71
* raise RuntimeError(pj_strerrno(pj_errno))
* geod_for(&self.geodesic_t)
* if pj_errno != 0: # <<<<<<<<<<<<<<
@@ -795,7 +800,7 @@
__pyx_1 = (pj_errno != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":72
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":72
* geod_for(&self.geodesic_t)
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno)) # <<<<<<<<<<<<<<
@@ -815,7 +820,7 @@
}
__pyx_L11:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":73
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":73
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno))
* if isnan(self.geodesic_t.ALPHA21): # <<<<<<<<<<<<<<
@@ -825,7 +830,7 @@
__pyx_8 = isnan(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA21);
if (__pyx_8) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":74
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":74
* raise RuntimeError(pj_strerrno(pj_errno))
* if isnan(self.geodesic_t.ALPHA21):
* raise ValueError('undefined forward geodesic (may be an equatorial arc)') # <<<<<<<<<<<<<<
@@ -844,17 +849,17 @@
}
__pyx_L12:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":75
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":75
* if isnan(self.geodesic_t.ALPHA21):
* raise ValueError('undefined forward geodesic (may be an equatorial arc)')
* if radians: # <<<<<<<<<<<<<<
* lonsdata[i] = self.geodesic_t.p2.v
* latsdata[i] = self.geodesic_t.p2.u
*/
- __pyx_2 = PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; goto __pyx_L1;}
+ __pyx_2 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; goto __pyx_L1;}
if (__pyx_2) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":76
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":76
* raise ValueError('undefined forward geodesic (may be an equatorial arc)')
* if radians:
* lonsdata[i] = self.geodesic_t.p2.v # <<<<<<<<<<<<<<
@@ -863,7 +868,7 @@
*/
(__pyx_v_lonsdata[__pyx_v_i]) = ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":77
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":77
* if radians:
* lonsdata[i] = self.geodesic_t.p2.v
* latsdata[i] = self.geodesic_t.p2.u # <<<<<<<<<<<<<<
@@ -872,7 +877,7 @@
*/
(__pyx_v_latsdata[__pyx_v_i]) = ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.u;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":78
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":78
* lonsdata[i] = self.geodesic_t.p2.v
* latsdata[i] = self.geodesic_t.p2.u
* azdata[i] = self.geodesic_t.ALPHA21 # <<<<<<<<<<<<<<
@@ -884,7 +889,7 @@
}
/*else*/ {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":80
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":80
* azdata[i] = self.geodesic_t.ALPHA21
* else:
* lonsdata[i] = _rad2dg*self.geodesic_t.p2.v # <<<<<<<<<<<<<<
@@ -900,7 +905,7 @@
Py_DECREF(__pyx_4); __pyx_4 = 0;
(__pyx_v_lonsdata[__pyx_v_i]) = __pyx_7;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":81
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":81
* else:
* lonsdata[i] = _rad2dg*self.geodesic_t.p2.v
* latsdata[i] = _rad2dg*self.geodesic_t.p2.u # <<<<<<<<<<<<<<
@@ -916,7 +921,7 @@
Py_DECREF(__pyx_4); __pyx_4 = 0;
(__pyx_v_latsdata[__pyx_v_i]) = __pyx_7;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":82
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":82
* lonsdata[i] = _rad2dg*self.geodesic_t.p2.v
* latsdata[i] = _rad2dg*self.geodesic_t.p2.u
* azdata[i] = _rad2dg*self.geodesic_t.ALPHA21 # <<<<<<<<<<<<<<
@@ -959,9 +964,9 @@
static char (__pyx_k12[]) = "Buffer lengths not the same";
static char (__pyx_k13[]) = "undefined inverse geodesic (may be an antipodal point)";
-static PyObject *__pyx_f_5_geod_4Geod__inv(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static PyObject *__pyx_f_py_5_geod_4Geod__inv(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
static char __pyx_doc_5_geod_4Geod__inv[] = "\n inverse transformation - return forward and back azimuths, plus distance\n between an initial and terminus lat/lon pair.\n if radians=True, lons/lats are radians instead of degrees.\n ";
-static PyObject *__pyx_f_5_geod_4Geod__inv(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+static PyObject *__pyx_f_py_5_geod_4Geod__inv(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
PyObject *__pyx_v_lons1 = 0;
PyObject *__pyx_v_lats1 = 0;
PyObject *__pyx_v_lons2 = 0;
@@ -1000,7 +1005,7 @@
Py_INCREF(__pyx_v_lats2);
Py_INCREF(__pyx_v_radians);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":94
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":94
* cdef void *londata, *latdata, *azdat, *distdat
* # if buffer api is supported, get pointer to data buffers.
* if PyObject_AsWriteBuffer(lons1, &londata, &buflenlons) <> 0: # <<<<<<<<<<<<<<
@@ -1010,7 +1015,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lons1,(&__pyx_v_londata),(&__pyx_v_buflenlons)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":95
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":95
* # if buffer api is supported, get pointer to data buffers.
* if PyObject_AsWriteBuffer(lons1, &londata, &buflenlons) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -1023,7 +1028,7 @@
}
__pyx_L2:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":96
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":96
* if PyObject_AsWriteBuffer(lons1, &londata, &buflenlons) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(lats1, &latdata, &buflenlats) <> 0: # <<<<<<<<<<<<<<
@@ -1033,7 +1038,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lats1,(&__pyx_v_latdata),(&__pyx_v_buflenlats)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":97
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":97
* raise RuntimeError
* if PyObject_AsWriteBuffer(lats1, &latdata, &buflenlats) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -1046,7 +1051,7 @@
}
__pyx_L3:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":98
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":98
* if PyObject_AsWriteBuffer(lats1, &latdata, &buflenlats) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(lons2, &azdat, &buflenaz) <> 0: # <<<<<<<<<<<<<<
@@ -1056,7 +1061,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lons2,(&__pyx_v_azdat),(&__pyx_v_buflenaz)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":99
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":99
* raise RuntimeError
* if PyObject_AsWriteBuffer(lons2, &azdat, &buflenaz) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -1069,7 +1074,7 @@
}
__pyx_L4:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":100
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":100
* if PyObject_AsWriteBuffer(lons2, &azdat, &buflenaz) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(lats2, &distdat, &buflend) <> 0: # <<<<<<<<<<<<<<
@@ -1079,7 +1084,7 @@
__pyx_1 = (PyObject_AsWriteBuffer(__pyx_v_lats2,(&__pyx_v_distdat),(&__pyx_v_buflend)) != 0);
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":101
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":101
* raise RuntimeError
* if PyObject_AsWriteBuffer(lats2, &distdat, &buflend) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -1092,24 +1097,24 @@
}
__pyx_L5:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":103
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":103
* raise RuntimeError
* # process data in buffer
* if not buflenlons == buflenlats == buflenaz == buflend: # <<<<<<<<<<<<<<
* raise RuntimeError("Buffer lengths not the same")
* ndim = buflenlons/_doublesize
*/
- __pyx_1 = __pyx_v_buflenlons == __pyx_v_buflenlats;
+ __pyx_1 = (__pyx_v_buflenlons == __pyx_v_buflenlats);
if (__pyx_1) {
- __pyx_1 = __pyx_v_buflenlats == __pyx_v_buflenaz;
+ __pyx_1 = (__pyx_v_buflenlats == __pyx_v_buflenaz);
if (__pyx_1) {
- __pyx_1 = __pyx_v_buflenaz == __pyx_v_buflend;
+ __pyx_1 = (__pyx_v_buflenaz == __pyx_v_buflend);
}
}
__pyx_2 = (!__pyx_1);
if (__pyx_2) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":104
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":104
* # process data in buffer
* if not buflenlons == buflenlats == buflenaz == buflend:
* raise RuntimeError("Buffer lengths not the same") # <<<<<<<<<<<<<<
@@ -1128,7 +1133,7 @@
}
__pyx_L6:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":105
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":105
* if not buflenlons == buflenlats == buflenaz == buflend:
* raise RuntimeError("Buffer lengths not the same")
* ndim = buflenlons/_doublesize # <<<<<<<<<<<<<<
@@ -1144,7 +1149,7 @@
Py_DECREF(__pyx_5); __pyx_5 = 0;
__pyx_v_ndim = __pyx_6;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":106
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":106
* raise RuntimeError("Buffer lengths not the same")
* ndim = buflenlons/_doublesize
* lonsdata = <double *>londata # <<<<<<<<<<<<<<
@@ -1153,7 +1158,7 @@
*/
__pyx_v_lonsdata = ((double (*))__pyx_v_londata);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":107
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":107
* ndim = buflenlons/_doublesize
* lonsdata = <double *>londata
* latsdata = <double *>latdata # <<<<<<<<<<<<<<
@@ -1162,7 +1167,7 @@
*/
__pyx_v_latsdata = ((double (*))__pyx_v_latdata);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":108
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":108
* lonsdata = <double *>londata
* latsdata = <double *>latdata
* azdata = <double *>azdat # <<<<<<<<<<<<<<
@@ -1171,7 +1176,7 @@
*/
__pyx_v_azdata = ((double (*))__pyx_v_azdat);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":109
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":109
* latsdata = <double *>latdata
* azdata = <double *>azdat
* distdata = <double *>distdat # <<<<<<<<<<<<<<
@@ -1180,7 +1185,7 @@
*/
__pyx_v_distdata = ((double (*))__pyx_v_distdat);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":110
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":110
* azdata = <double *>azdat
* distdata = <double *>distdat
* for i from 0 <= i < ndim: # <<<<<<<<<<<<<<
@@ -1189,17 +1194,17 @@
*/
for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_ndim; __pyx_v_i++) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":111
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":111
* distdata = <double *>distdat
* for i from 0 <= i < ndim:
* if radians: # <<<<<<<<<<<<<<
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i]
*/
- __pyx_1 = PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; goto __pyx_L1;}
+ __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; goto __pyx_L1;}
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":112
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":112
* for i from 0 <= i < ndim:
* if radians:
* self.geodesic_t.p1.v = lonsdata[i] # <<<<<<<<<<<<<<
@@ -1208,7 +1213,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = (__pyx_v_lonsdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":113
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":113
* if radians:
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i] # <<<<<<<<<<<<<<
@@ -1217,7 +1222,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = (__pyx_v_latsdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":114
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":114
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i]
* self.geodesic_t.p2.v = azdata[i] # <<<<<<<<<<<<<<
@@ -1226,7 +1231,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v = (__pyx_v_azdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":115
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":115
* self.geodesic_t.p1.u = latsdata[i]
* self.geodesic_t.p2.v = azdata[i]
* self.geodesic_t.p2.u = distdata[i] # <<<<<<<<<<<<<<
@@ -1238,7 +1243,7 @@
}
/*else*/ {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":117
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":117
* self.geodesic_t.p2.u = distdata[i]
* else:
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i] # <<<<<<<<<<<<<<
@@ -1254,7 +1259,7 @@
Py_DECREF(__pyx_5); __pyx_5 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_7;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":118
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":118
* else:
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
* self.geodesic_t.p1.u = _dg2rad*latsdata[i] # <<<<<<<<<<<<<<
@@ -1270,7 +1275,7 @@
Py_DECREF(__pyx_5); __pyx_5 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_7;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":119
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":119
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
* self.geodesic_t.p1.u = _dg2rad*latsdata[i]
* self.geodesic_t.p2.v = _dg2rad*azdata[i] # <<<<<<<<<<<<<<
@@ -1286,7 +1291,7 @@
Py_DECREF(__pyx_5); __pyx_5 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v = __pyx_7;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":120
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":120
* self.geodesic_t.p1.u = _dg2rad*latsdata[i]
* self.geodesic_t.p2.v = _dg2rad*azdata[i]
* self.geodesic_t.p2.u = _dg2rad*distdata[i] # <<<<<<<<<<<<<<
@@ -1304,7 +1309,7 @@
}
__pyx_L9:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":121
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":121
* self.geodesic_t.p2.v = _dg2rad*azdata[i]
* self.geodesic_t.p2.u = _dg2rad*distdata[i]
* geod_inv(&self.geodesic_t) # <<<<<<<<<<<<<<
@@ -1313,7 +1318,7 @@
*/
geod_inv((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":122
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":122
* self.geodesic_t.p2.u = _dg2rad*distdata[i]
* geod_inv(&self.geodesic_t)
* if isnan(self.geodesic_t.DIST): # <<<<<<<<<<<<<<
@@ -1323,7 +1328,7 @@
__pyx_8 = isnan(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.DIST);
if (__pyx_8) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":123
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":123
* geod_inv(&self.geodesic_t)
* if isnan(self.geodesic_t.DIST):
* raise ValueError('undefined inverse geodesic (may be an antipodal point)') # <<<<<<<<<<<<<<
@@ -1342,7 +1347,7 @@
}
__pyx_L10:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":124
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":124
* if isnan(self.geodesic_t.DIST):
* raise ValueError('undefined inverse geodesic (may be an antipodal point)')
* if pj_errno != 0: # <<<<<<<<<<<<<<
@@ -1352,7 +1357,7 @@
__pyx_2 = (pj_errno != 0);
if (__pyx_2) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":125
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":125
* raise ValueError('undefined inverse geodesic (may be an antipodal point)')
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno)) # <<<<<<<<<<<<<<
@@ -1372,17 +1377,17 @@
}
__pyx_L11:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":126
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":126
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno))
* if radians: # <<<<<<<<<<<<<<
* lonsdata[i] = self.geodesic_t.ALPHA12
* latsdata[i] = self.geodesic_t.ALPHA21
*/
- __pyx_1 = PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;}
+ __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;}
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":127
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":127
* raise RuntimeError(pj_strerrno(pj_errno))
* if radians:
* lonsdata[i] = self.geodesic_t.ALPHA12 # <<<<<<<<<<<<<<
@@ -1391,7 +1396,7 @@
*/
(__pyx_v_lonsdata[__pyx_v_i]) = ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":128
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":128
* if radians:
* lonsdata[i] = self.geodesic_t.ALPHA12
* latsdata[i] = self.geodesic_t.ALPHA21 # <<<<<<<<<<<<<<
@@ -1403,7 +1408,7 @@
}
/*else*/ {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":130
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":130
* latsdata[i] = self.geodesic_t.ALPHA21
* else:
* lonsdata[i] = _rad2dg*self.geodesic_t.ALPHA12 # <<<<<<<<<<<<<<
@@ -1419,7 +1424,7 @@
Py_DECREF(__pyx_4); __pyx_4 = 0;
(__pyx_v_lonsdata[__pyx_v_i]) = __pyx_7;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":131
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":131
* else:
* lonsdata[i] = _rad2dg*self.geodesic_t.ALPHA12
* latsdata[i] = _rad2dg*self.geodesic_t.ALPHA21 # <<<<<<<<<<<<<<
@@ -1437,7 +1442,7 @@
}
__pyx_L12:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":132
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":132
* lonsdata[i] = _rad2dg*self.geodesic_t.ALPHA12
* latsdata[i] = _rad2dg*self.geodesic_t.ALPHA21
* azdata[i] = self.geodesic_t.DIST # <<<<<<<<<<<<<<
@@ -1465,9 +1470,9 @@
return __pyx_r;
}
-static PyObject *__pyx_f_5_geod_4Geod__npts(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static PyObject *__pyx_f_py_5_geod_4Geod__npts(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
static char __pyx_doc_5_geod_4Geod__npts[] = "\n given initial and terminus lat/lon, find npts intermediate points.";
-static PyObject *__pyx_f_5_geod_4Geod__npts(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+static PyObject *__pyx_f_py_5_geod_4Geod__npts(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
double __pyx_v_lon1;
double __pyx_v_lat1;
double __pyx_v_lon2;
@@ -1493,17 +1498,17 @@
__pyx_v_lats = Py_None; Py_INCREF(Py_None);
__pyx_v_lons = Py_None; Py_INCREF(Py_None);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":139
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":139
* cdef int i
* cdef double del_s
* if radians: # <<<<<<<<<<<<<<
* self.geodesic_t.p1.v = lon1
* self.geodesic_t.p1.u = lat1
*/
- __pyx_1 = PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;}
+ __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;}
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":140
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":140
* cdef double del_s
* if radians:
* self.geodesic_t.p1.v = lon1 # <<<<<<<<<<<<<<
@@ -1512,7 +1517,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_v_lon1;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":141
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":141
* if radians:
* self.geodesic_t.p1.v = lon1
* self.geodesic_t.p1.u = lat1 # <<<<<<<<<<<<<<
@@ -1521,7 +1526,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_v_lat1;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":142
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":142
* self.geodesic_t.p1.v = lon1
* self.geodesic_t.p1.u = lat1
* self.geodesic_t.p2.v = lon2 # <<<<<<<<<<<<<<
@@ -1530,7 +1535,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v = __pyx_v_lon2;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":143
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":143
* self.geodesic_t.p1.u = lat1
* self.geodesic_t.p2.v = lon2
* self.geodesic_t.p2.u = lat2 # <<<<<<<<<<<<<<
@@ -1542,7 +1547,7 @@
}
/*else*/ {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":145
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":145
* self.geodesic_t.p2.u = lat2
* else:
* self.geodesic_t.p1.v = _dg2rad*lon1 # <<<<<<<<<<<<<<
@@ -1558,7 +1563,7 @@
Py_DECREF(__pyx_4); __pyx_4 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_5;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":146
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":146
* else:
* self.geodesic_t.p1.v = _dg2rad*lon1
* self.geodesic_t.p1.u = _dg2rad*lat1 # <<<<<<<<<<<<<<
@@ -1574,7 +1579,7 @@
Py_DECREF(__pyx_4); __pyx_4 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_5;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":147
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":147
* self.geodesic_t.p1.v = _dg2rad*lon1
* self.geodesic_t.p1.u = _dg2rad*lat1
* self.geodesic_t.p2.v = _dg2rad*lon2 # <<<<<<<<<<<<<<
@@ -1590,7 +1595,7 @@
Py_DECREF(__pyx_4); __pyx_4 = 0;
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p2.v = __pyx_5;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":148
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":148
* self.geodesic_t.p1.u = _dg2rad*lat1
* self.geodesic_t.p2.v = _dg2rad*lon2
* self.geodesic_t.p2.u = _dg2rad*lat2 # <<<<<<<<<<<<<<
@@ -1608,7 +1613,7 @@
}
__pyx_L2:;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":150
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":150
* self.geodesic_t.p2.u = _dg2rad*lat2
* # do inverse computation to set azimuths, distance.
* geod_inv(&self.geodesic_t) # <<<<<<<<<<<<<<
@@ -1617,7 +1622,7 @@
*/
geod_inv((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":152
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":152
* geod_inv(&self.geodesic_t)
* # set up some constants needed for forward computation.
* geod_pre(&self.geodesic_t) # <<<<<<<<<<<<<<
@@ -1626,7 +1631,7 @@
*/
geod_pre((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":154
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":154
* geod_pre(&self.geodesic_t)
* # distance increment.
* del_s = self.geodesic_t.DIST/(npts+1) # <<<<<<<<<<<<<<
@@ -1635,7 +1640,7 @@
*/
__pyx_v_del_s = (((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.DIST / (__pyx_v_npts + 1));
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":156
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":156
* del_s = self.geodesic_t.DIST/(npts+1)
* # initialize output tuples.
* lats = () # <<<<<<<<<<<<<<
@@ -1647,7 +1652,7 @@
__pyx_v_lats = __pyx_2;
__pyx_2 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":157
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":157
* # initialize output tuples.
* lats = ()
* lons = () # <<<<<<<<<<<<<<
@@ -1659,7 +1664,7 @@
__pyx_v_lons = __pyx_3;
__pyx_3 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":159
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":159
* lons = ()
* # loop over intermediate points, compute lat/lons.
* for i from 1 <= i < npts+1: # <<<<<<<<<<<<<<
@@ -1669,7 +1674,7 @@
__pyx_6 = (__pyx_v_npts + 1);
for (__pyx_v_i = 1; __pyx_v_i < __pyx_6; __pyx_v_i++) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":160
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":160
* # loop over intermediate points, compute lat/lons.
* for i from 1 <= i < npts+1:
* self.geodesic_t.DIST = i*del_s # <<<<<<<<<<<<<<
@@ -1678,7 +1683,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.DIST = (__pyx_v_i * __pyx_v_del_s);
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":161
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":161
* for i from 1 <= i < npts+1:
* self.geodesic_t.DIST = i*del_s
* geod_for(&self.geodesic_t) # <<<<<<<<<<<<<<
@@ -1687,17 +1692,17 @@
*/
geod_for((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":162
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":162
* self.geodesic_t.DIST = i*del_s
* geod_for(&self.geodesic_t)
* if radians: # <<<<<<<<<<<<<<
* lats = lats + (self.geodesic_t.p2.u,)
* lons = lons + (self.geodesic_t.p2.v,)
*/
- __pyx_1 = PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; goto __pyx_L1;}
+ __pyx_1 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; goto __pyx_L1;}
if (__pyx_1) {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":163
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":163
* geod_for(&self.geodesic_t)
* if radians:
* lats = lats + (self.geodesic_t.p2.u,) # <<<<<<<<<<<<<<
@@ -1714,7 +1719,7 @@
__pyx_v_lats = __pyx_3;
__pyx_3 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":164
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":164
* if radians:
* lats = lats + (self.geodesic_t.p2.u,)
* lons = lons + (self.geodesic_t.p2.v,) # <<<<<<<<<<<<<<
@@ -1734,7 +1739,7 @@
}
/*else*/ {
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":166
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":166
* lons = lons + (self.geodesic_t.p2.v,)
* else:
* lats = lats + (_rad2dg*self.geodesic_t.p2.u,) # <<<<<<<<<<<<<<
@@ -1755,7 +1760,7 @@
__pyx_v_lats = __pyx_2;
__pyx_2 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":167
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":167
* else:
* lats = lats + (_rad2dg*self.geodesic_t.p2.u,)
* lons = lons + (_rad2dg*self.geodesic_t.p2.v,) # <<<<<<<<<<<<<<
@@ -1778,7 +1783,7 @@
__pyx_L5:;
}
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":168
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":168
* lats = lats + (_rad2dg*self.geodesic_t.p2.u,)
* lons = lons + (_rad2dg*self.geodesic_t.p2.v,)
* return lons, lats # <<<<<<<<<<<<<<
@@ -1812,9 +1817,14 @@
{&__pyx_n_RuntimeError, "RuntimeError"},
{&__pyx_n_ValueError, "ValueError"},
{&__pyx_n___class__, "__class__"},
+ {&__pyx_n___new__, "__new__"},
+ {&__pyx_n___reduce__, "__reduce__"},
{&__pyx_n___version__, "__version__"},
{&__pyx_n__dg2rad, "_dg2rad"},
{&__pyx_n__doublesize, "_doublesize"},
+ {&__pyx_n__fwd, "_fwd"},
+ {&__pyx_n__inv, "_inv"},
+ {&__pyx_n__npts, "_npts"},
{&__pyx_n__rad2dg, "_rad2dg"},
{&__pyx_n_append, "append"},
{&__pyx_n_degrees, "degrees"},
@@ -1826,16 +1836,16 @@
};
static __Pyx_StringTabEntry __pyx_string_tab[] = {
- {&__pyx_k2p, __pyx_k2, sizeof(__pyx_k2)},
- {&__pyx_k6p, __pyx_k6, sizeof(__pyx_k6)},
- {&__pyx_k7p, __pyx_k7, sizeof(__pyx_k7)},
- {&__pyx_k8p, __pyx_k8, sizeof(__pyx_k8)},
- {&__pyx_k9p, __pyx_k9, sizeof(__pyx_k9)},
- {&__pyx_k10p, __pyx_k10, sizeof(__pyx_k10)},
- {&__pyx_k11p, __pyx_k11, sizeof(__pyx_k11)},
- {&__pyx_k12p, __pyx_k12, sizeof(__pyx_k12)},
- {&__pyx_k13p, __pyx_k13, sizeof(__pyx_k13)},
- {0, 0, 0}
+ {&__pyx_k2p, __pyx_k2, sizeof(__pyx_k2), 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},
+ {&__pyx_k9p, __pyx_k9, sizeof(__pyx_k9), 0},
+ {&__pyx_k10p, __pyx_k10, sizeof(__pyx_k10), 0},
+ {&__pyx_k11p, __pyx_k11, sizeof(__pyx_k11), 0},
+ {&__pyx_k12p, __pyx_k12, sizeof(__pyx_k12), 0},
+ {&__pyx_k13p, __pyx_k13, sizeof(__pyx_k13), 0},
+ {0, 0, 0, 0}
};
static PyObject *__pyx_tp_new_5_geod_Geod(PyTypeObject *t, PyObject *a, PyObject *k) {
@@ -1843,7 +1853,7 @@
struct __pyx_obj_5_geod_Geod *p = (struct __pyx_obj_5_geod_Geod *)o;
p->geodparams = Py_None; Py_INCREF(Py_None);
p->proj_version = Py_None; Py_INCREF(Py_None);
- if (__pyx_f_5_geod_4Geod___new__(o, a, k) < 0) {
+ if (__pyx_f_py_5_geod_4Geod___new__(o, a, k) < 0) {
Py_DECREF(o); o = 0;
}
return o;
@@ -1878,10 +1888,10 @@
}
static struct PyMethodDef __pyx_methods_5_geod_Geod[] = {
- {"__reduce__", (PyCFunction)__pyx_f_5_geod_4Geod___reduce__, METH_NOARGS, __pyx_doc_5_geod_4Geod___reduce__},
- {"_fwd", (PyCFunction)__pyx_f_5_geod_4Geod__fwd, METH_VARARGS|METH_KEYWORDS, __pyx_doc_5_geod_4Geod__fwd},
- {"_inv", (PyCFunction)__pyx_f_5_geod_4Geod__inv, METH_VARARGS|METH_KEYWORDS, __pyx_doc_5_geod_4Geod__inv},
- {"_npts", (PyCFunction)__pyx_f_5_geod_4Geod__npts, METH_VARARGS|METH_KEYWORDS, __pyx_doc_5_geod_4Geod__npts},
+ {"__reduce__", (PyCFunction)__pyx_f_py_5_geod_4Geod___reduce__, METH_NOARGS, __pyx_doc_5_geod_4Geod___reduce__},
+ {"_fwd", (PyCFunction)__pyx_f_py_5_geod_4Geod__fwd, METH_VARARGS|METH_KEYWORDS, __pyx_doc_5_geod_4Geod__fwd},
+ {"_inv", (PyCFunction)__pyx_f_py_5_geod_4Geod__inv, METH_VARARGS|METH_KEYWORDS, __pyx_doc_5_geod_4Geod__inv},
+ {"_npts", (PyCFunction)__pyx_f_py_5_geod_4Geod__npts, METH_VARARGS|METH_KEYWORDS, __pyx_doc_5_geod_4Geod__npts},
{0, 0, 0, 0}
};
@@ -1930,7 +1940,9 @@
0, /*nb_true_divide*/
0, /*nb_inplace_floor_divide*/
0, /*nb_inplace_true_divide*/
+ #if PY_VERSION_HEX >= 0x02050000
0, /*nb_index*/
+ #endif
};
static PySequenceMethods __pyx_tp_as_sequence_Geod = {
@@ -2034,7 +2046,7 @@
if (PyObject_SetAttrString(__pyx_m, "Geod", (PyObject *)&__pyx_type_5_geod_Geod) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 5; goto __pyx_L1;}
__pyx_ptype_5_geod_Geod = &__pyx_type_5_geod_Geod;
- /* "/Volumes/User/jwhitaker/python/pyproj/_pyproj.pxi":1
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_pyproj.pxi":1
* import math # <<<<<<<<<<<<<<
*
* _dg2rad = math.radians(1.)
@@ -2043,7 +2055,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_n_math, __pyx_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 1; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_pyproj.pxi":3
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_pyproj.pxi":3
* import math
*
* _dg2rad = math.radians(1.) # <<<<<<<<<<<<<<
@@ -2063,7 +2075,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_n__dg2rad, __pyx_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_pyproj.pxi":4
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_pyproj.pxi":4
*
* _dg2rad = math.radians(1.)
* _rad2dg = math.degrees(1.) # <<<<<<<<<<<<<<
@@ -2083,7 +2095,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_n__rad2dg, __pyx_1) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 4; goto __pyx_L1;}
Py_DECREF(__pyx_1); __pyx_1 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_pyproj.pxi":5
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_pyproj.pxi":5
* _dg2rad = math.radians(1.)
* _rad2dg = math.degrees(1.)
* _doublesize = sizeof(double) # <<<<<<<<<<<<<<
@@ -2094,7 +2106,7 @@
if (PyObject_SetAttr(__pyx_m, __pyx_n__doublesize, __pyx_3) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 5; goto __pyx_L1;}
Py_DECREF(__pyx_3); __pyx_3 = 0;
- /* "/Volumes/User/jwhitaker/python/pyproj/_pyproj.pxi":6
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_pyproj.pxi":6
* _rad2dg = math.degrees(1.)
* _doublesize = sizeof(double)
* __version__ = "1.8.3" # <<<<<<<<<<<<<<
@@ -2103,7 +2115,7 @@
*/
if (PyObject_SetAttr(__pyx_m, __pyx_n___version__, __pyx_k2p) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 6; goto __pyx_L1;}
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":29
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":29
* return (self.__class__,(self.geodparams,))
*
* def _fwd(self, object lons, object lats, object az, object dist, radians=False): # <<<<<<<<<<<<<<
@@ -2113,7 +2125,7 @@
Py_INCREF(Py_False);
__pyx_k3 = Py_False;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":84
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":84
* azdata[i] = _rad2dg*self.geodesic_t.ALPHA21
*
* def _inv(self, object lons1, object lats1, object lons2, object lats2, radians=False): # <<<<<<<<<<<<<<
@@ -2123,7 +2135,7 @@
Py_INCREF(Py_False);
__pyx_k4 = Py_False;
- /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":134
+ /* "/Users/jsw/python/matplotlib/toolkits/basemap/src/_geod.pyx":134
* azdata[i] = self.geodesic_t.DIST
*
* def _npts(self, double lon1, double lat1, double lon2, double lat2, int npts, radians=False): # <<<<<<<<<<<<<<
@@ -2288,7 +2300,11 @@
static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) {
while (t->p) {
- *t->p = PyString_FromStringAndSize(t->s, t->n - 1);
+ if (t->is_unicode) {
+ *t->p = PyUnicode_DecodeUTF8(t->s, t->n - 1, NULL);
+ } else {
+ *t->p = PyString_FromStringAndSize(t->s, t->n - 1);
+ }
if (!*t->p)
return -1;
++t;
Modified: trunk/toolkits/basemap/src/_proj.c
===================================================================
--- trunk/toolkits/basemap/src/_proj.c 2007-10-12 17:30:17 UTC (rev 3939)
+++ trunk/toolkits/basemap/src/_proj.c 2007-10-14 14:16:48 UTC (rev 3940)
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.9.6.6 on Wed Sep 12 12:21:02 2007 */
+/* Generated by Cython 0.9.6.7 on Sun Oct 14 08:16:26 2007 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -37,7 +37,7 @@
typedef struct {const char *s; const void **p;} __Pyx_CApiTabEntry; /*proto*/
typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/
-typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/
+typedef struct {PyObject **p; char *s; long n; int is_unicode;} __Pyx_S...
[truncated message content] |
