Menu
▾
▴
SF.net SVN: matplotlib:[8188] trunk/toolkits/basemap/src
|
From: <js...@us...> - 2010-03-12 19:28:00
|
Revision: 8188
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8188&view=rev
Author: jswhit
Date: 2010-03-12 19:27:47 +0000 (Fri, 12 Mar 2010)
Log Message:
-----------
revert pj_init.c to version in proj4 4.6.1.
Modified Paths:
--------------
trunk/toolkits/basemap/src/_geod.c
trunk/toolkits/basemap/src/_proj.c
trunk/toolkits/basemap/src/_pyproj.pxi
trunk/toolkits/basemap/src/pj_init.c
Modified: trunk/toolkits/basemap/src/_geod.c
===================================================================
--- trunk/toolkits/basemap/src/_geod.c 2010-03-10 14:14:52 UTC (rev 8187)
+++ trunk/toolkits/basemap/src/_geod.c 2010-03-12 19:27:47 UTC (rev 8188)
@@ -1,11 +1,12 @@
-/* Generated by Cython 0.11.2 on Wed Nov 4 09:16:32 2009 */
+/* Generated by Cython 0.12.1 on Fri Mar 12 12:24:37 2010 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "structmember.h"
#ifndef Py_PYTHON_H
#error Python headers needed to compile C extensions, please install development version of Python.
-#endif
+#else
+
#ifndef PY_LONG_LONG
#define PY_LONG_LONG LONG_LONG
#endif
@@ -15,7 +16,9 @@
#if PY_VERSION_HEX < 0x02040000
#define METH_COEXIST 0
#define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
+ #define PyDict_Contains(d,o) PySequence_Contains(d,o)
#endif
+
#if PY_VERSION_HEX < 0x02050000
typedef int Py_ssize_t;
#define PY_SSIZE_T_MAX INT_MAX
@@ -25,7 +28,9 @@
#define PyInt_AsSsize_t(o) PyInt_AsLong(o)
#define PyNumber_Index(o) PyNumber_Int(o)
#define PyIndex_Check(o) PyNumber_Check(o)
+ #define PyErr_WarnEx(category, message, stacklevel) PyErr_Warn(category, message)
#endif
+
#if PY_VERSION_HEX < 0x02060000
#define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)
#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
@@ -35,17 +40,17 @@
#define PyType_Modified(t)
typedef struct {
- void *buf;
- PyObject *obj;
- Py_ssize_t len;
- Py_ssize_t itemsize;
- int readonly;
- int ndim;
- char *format;
- Py_ssize_t *shape;
- Py_ssize_t *strides;
- Py_ssize_t *suboffsets;
- void *internal;
+ void *buf;
+ PyObject *obj;
+ Py_ssize_t len;
+ Py_ssize_t itemsize;
+ int readonly;
+ int ndim;
+ char *format;
+ Py_ssize_t *shape;
+ Py_ssize_t *strides;
+ Py_ssize_t *suboffsets;
+ void *internal;
} Py_buffer;
#define PyBUF_SIMPLE 0
@@ -59,22 +64,32 @@
#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
#endif
+
#if PY_MAJOR_VERSION < 3
#define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
#else
#define __Pyx_BUILTIN_MODULE_NAME "builtins"
#endif
+
#if PY_MAJOR_VERSION >= 3
#define Py_TPFLAGS_CHECKTYPES 0
#define Py_TPFLAGS_HAVE_INDEX 0
#endif
+
#if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)
#define Py_TPFLAGS_HAVE_NEWBUFFER 0
#endif
+
#if PY_MAJOR_VERSION >= 3
#define PyBaseString_Type PyUnicode_Type
- #define PyString_Type PyBytes_Type
- #define PyString_CheckExact PyBytes_CheckExact
+ #define PyString_Type PyUnicode_Type
+ #define PyString_CheckExact PyUnicode_CheckExact
+#else
+ #define PyBytes_Type PyString_Type
+ #define PyBytes_CheckExact PyString_CheckExact
+#endif
+
+#if PY_MAJOR_VERSION >= 3
#define PyInt_Type PyLong_Type
#define PyInt_Check(op) PyLong_Check(op)
#define PyInt_CheckExact(op) PyLong_CheckExact(op)
@@ -89,13 +104,17 @@
#define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask
#define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
#define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)
+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)
#else
#define __Pyx_PyNumber_Divide(x,y) PyNumber_Divide(x,y)
- #define PyBytes_Type PyString_Type
+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y)
+
#endif
+
#if PY_MAJOR_VERSION >= 3
#define PyMethod_New(func, self, klass) PyInstanceMethod_New(func)
#endif
+
#if !defined(WIN32) && !defined(MS_WINDOWS)
#ifndef __stdcall
#define __stdcall
@@ -109,6 +128,7 @@
#else
#define _USE_MATH_DEFINES
#endif
+
#if PY_VERSION_HEX < 0x02050000
#define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),((char *)(n)))
#define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))
@@ -118,6 +138,7 @@
#define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))
#define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),(n))
#endif
+
#if PY_VERSION_HEX < 0x02050000
#define __Pyx_NAMESTR(n) ((char *)(n))
#define __Pyx_DOCSTR(n) ((char *)(n))
@@ -136,24 +157,20 @@
#include "math.h"
#include "geodesic.h"
#include "proj_api.h"
-#define __PYX_USE_C99_COMPLEX defined(_Complex_I)
-
-#ifdef __GNUC__
-#define INLINE __inline__
-#elif _WIN32
-#define INLINE __inline
-#else
-#define INLINE
+#ifndef CYTHON_INLINE
+ #if defined(__GNUC__)
+ #define CYTHON_INLINE __inline__
+ #elif defined(_MSC_VER)
+ #define CYTHON_INLINE __inline
+ #else
+ #define CYTHON_INLINE
+ #endif
#endif
-typedef struct {PyObject **p; char *s; long n; char is_unicode; char intern; char is_identifier;} __Pyx_StringTabEntry; /*proto*/
+typedef struct {PyObject **p; char *s; const long n; const char* encoding; const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry; /*proto*/
-
-static int __pyx_skip_dispatch = 0;
-
-
/* Type Conversion Predeclarations */
#if PY_MAJOR_VERSION < 3
@@ -166,9 +183,12 @@
#define __Pyx_PyBytes_AsString PyBytes_AsString
#endif
+#define __Pyx_PyBytes_FromUString(s) __Pyx_PyBytes_FromString((char*)s)
+#define __Pyx_PyBytes_AsUString(s) ((unsigned char*) __Pyx_PyBytes_AsString(s))
+
#define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))
-static INLINE int __Pyx_PyObject_IsTrue(PyObject*);
-static INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
+static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);
+static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
#if !defined(T_PYSSIZET)
#if PY_VERSION_HEX < 0x02050000
@@ -185,6 +205,40 @@
#endif
#endif
+
+#if !defined(T_ULONGLONG)
+#define __Pyx_T_UNSIGNED_INT(x) \
+ ((sizeof(x) == sizeof(unsigned char)) ? T_UBYTE : \
+ ((sizeof(x) == sizeof(unsigned short)) ? T_USHORT : \
+ ((sizeof(x) == sizeof(unsigned int)) ? T_UINT : \
+ ((sizeof(x) == sizeof(unsigned long)) ? T_ULONG : -1))))
+#else
+#define __Pyx_T_UNSIGNED_INT(x) \
+ ((sizeof(x) == sizeof(unsigned char)) ? T_UBYTE : \
+ ((sizeof(x) == sizeof(unsigned short)) ? T_USHORT : \
+ ((sizeof(x) == sizeof(unsigned int)) ? T_UINT : \
+ ((sizeof(x) == sizeof(unsigned long)) ? T_ULONG : \
+ ((sizeof(x) == sizeof(unsigned PY_LONG_LONG)) ? T_ULONGLONG : -1)))))
+#endif
+#if !defined(T_LONGLONG)
+#define __Pyx_T_SIGNED_INT(x) \
+ ((sizeof(x) == sizeof(char)) ? T_BYTE : \
+ ((sizeof(x) == sizeof(short)) ? T_SHORT : \
+ ((sizeof(x) == sizeof(int)) ? T_INT : \
+ ((sizeof(x) == sizeof(long)) ? T_LONG : -1))))
+#else
+#define __Pyx_T_SIGNED_INT(x) \
+ ((sizeof(x) == sizeof(char)) ? T_BYTE : \
+ ((sizeof(x) == sizeof(short)) ? T_SHORT : \
+ ((sizeof(x) == sizeof(int)) ? T_INT : \
+ ((sizeof(x) == sizeof(long)) ? T_LONG : \
+ ((sizeof(x) == sizeof(PY_LONG_LONG)) ? T_LONGLONG : -1)))))
+#endif
+
+#define __Pyx_T_FLOATING(x) \
+ ((sizeof(x) == sizeof(float)) ? T_FLOAT : \
+ ((sizeof(x) == sizeof(double)) ? T_DOUBLE : -1))
+
#if !defined(T_SIZET)
#if !defined(T_ULONGLONG)
#define T_SIZET \
@@ -198,9 +252,9 @@
#endif
#endif
-static INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
-static INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
-static INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
+static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
+static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
+static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
#define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x))
@@ -222,6 +276,7 @@
static PyObject *__pyx_m;
static PyObject *__pyx_b;
static PyObject *__pyx_empty_tuple;
+static PyObject *__pyx_empty_bytes;
static int __pyx_lineno;
static int __pyx_clineno = 0;
static const char * __pyx_cfilenm= __FILE__;
@@ -229,35 +284,69 @@
static const char **__pyx_f;
-#ifdef CYTHON_REFNANNY
-typedef struct {
- void (*INCREF)(void*, PyObject*, int);
- void (*DECREF)(void*, PyObject*, int);
- void (*GOTREF)(void*, PyObject*, int);
- void (*GIVEREF)(void*, PyObject*, int);
- void* (*NewContext)(const char*, int, const char*);
- void (*FinishContext)(void**);
-} __Pyx_RefnannyAPIStruct;
-static __Pyx_RefnannyAPIStruct *__Pyx_Refnanny = NULL;
-#define __Pyx_ImportRefcountAPI(name) (__Pyx_RefnannyAPIStruct *) PyCObject_Import((char *)name, (char *)"RefnannyAPI")
-#define __Pyx_INCREF(r) __Pyx_Refnanny->INCREF(__pyx_refchk, (PyObject *)(r), __LINE__)
-#define __Pyx_DECREF(r) __Pyx_Refnanny->DECREF(__pyx_refchk, (PyObject *)(r), __LINE__)
-#define __Pyx_GOTREF(r) __Pyx_Refnanny->GOTREF(__pyx_refchk, (PyObject *)(r), __LINE__)
-#define __Pyx_GIVEREF(r) __Pyx_Refnanny->GIVEREF(__pyx_refchk, (PyObject *)(r), __LINE__)
-#define __Pyx_XDECREF(r) if((r) == NULL) ; else __Pyx_DECREF(r)
-#define __Pyx_SetupRefcountContext(name) void* __pyx_refchk = __Pyx_Refnanny->NewContext((name), __LINE__, __FILE__)
-#define __Pyx_FinishRefcountContext() __Pyx_Refnanny->FinishContext(&__pyx_refchk)
+/* Type declarations */
+
+/* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":5
+ * include "_pyproj.pxi"
+ *
+ * cdef class Geod: # <<<<<<<<<<<<<<
+ * cdef GEODESIC_T geodesic_t
+ * cdef public object geodstring
+ */
+
+struct __pyx_obj_5_geod_Geod {
+ PyObject_HEAD
+ GEODESIC_T geodesic_t;
+ PyObject *geodstring;
+ PyObject *proj_version;
+ char *geodinitstring;
+};
+
+#ifndef CYTHON_REFNANNY
+ #define CYTHON_REFNANNY 0
+#endif
+
+#if CYTHON_REFNANNY
+ typedef struct {
+ void (*INCREF)(void*, PyObject*, int);
+ void (*DECREF)(void*, PyObject*, int);
+ void (*GOTREF)(void*, PyObject*, int);
+ void (*GIVEREF)(void*, PyObject*, int);
+ void* (*SetupContext)(const char*, int, const char*);
+ void (*FinishContext)(void**);
+ } __Pyx_RefNannyAPIStruct;
+ static __Pyx_RefNannyAPIStruct *__Pyx_RefNanny = NULL;
+ static __Pyx_RefNannyAPIStruct * __Pyx_RefNannyImportAPI(const char *modname) {
+ PyObject *m = NULL, *p = NULL;
+ void *r = NULL;
+ m = PyImport_ImportModule((char *)modname);
+ if (!m) goto end;
+ p = PyObject_GetAttrString(m, (char *)"RefNannyAPI");
+ if (!p) goto end;
+ r = PyLong_AsVoidPtr(p);
+ end:
+ Py_XDECREF(p);
+ Py_XDECREF(m);
+ return (__Pyx_RefNannyAPIStruct *)r;
+ }
+ #define __Pyx_RefNannySetupContext(name) void *__pyx_refnanny = __Pyx_RefNanny->SetupContext((name), __LINE__, __FILE__)
+ #define __Pyx_RefNannyFinishContext() __Pyx_RefNanny->FinishContext(&__pyx_refnanny)
+ #define __Pyx_INCREF(r) __Pyx_RefNanny->INCREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
+ #define __Pyx_DECREF(r) __Pyx_RefNanny->DECREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
+ #define __Pyx_GOTREF(r) __Pyx_RefNanny->GOTREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
+ #define __Pyx_GIVEREF(r) __Pyx_RefNanny->GIVEREF(__pyx_refnanny, (PyObject *)(r), __LINE__)
+ #define __Pyx_XDECREF(r) do { if((r) != NULL) {__Pyx_DECREF(r);} } while(0)
#else
-#define __Pyx_INCREF(r) Py_INCREF(r)
-#define __Pyx_DECREF(r) Py_DECREF(r)
-#define __Pyx_GOTREF(r)
-#define __Pyx_GIVEREF(r)
-#define __Pyx_XDECREF(r) Py_XDECREF(r)
-#define __Pyx_SetupRefcountContext(name)
-#define __Pyx_FinishRefcountContext()
+ #define __Pyx_RefNannySetupContext(name)
+ #define __Pyx_RefNannyFinishContext()
+ #define __Pyx_INCREF(r) Py_INCREF(r)
+ #define __Pyx_DECREF(r) Py_DECREF(r)
+ #define __Pyx_GOTREF(r)
+ #define __Pyx_GIVEREF(r)
+ #define __Pyx_XDECREF(r) Py_XDECREF(r)
#endif /* CYTHON_REFNANNY */
-#define __Pyx_XGIVEREF(r) if((r) == NULL) ; else __Pyx_GIVEREF(r)
-#define __Pyx_XGOTREF(r) if((r) == NULL) ; else __Pyx_GOTREF(r)
+#define __Pyx_XGIVEREF(r) do { if((r) != NULL) {__Pyx_GIVEREF(r);} } while(0)
+#define __Pyx_XGOTREF(r) do { if((r) != NULL) {__Pyx_GOTREF(r);} } while(0)
static void __Pyx_RaiseDoubleKeywordsError(
const char* func_name, PyObject* kw_name); /*proto*/
@@ -271,150 +360,154 @@
static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
+static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
+static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+
static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
-static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
-static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);
-static INLINE int __Pyx_StrEq(const char *, const char *); /*proto*/
+static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);
-static INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);
+static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);
-static INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);
+static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject *);
-static INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);
+static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject *);
-static INLINE char __Pyx_PyInt_AsChar(PyObject *);
+static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject *);
-static INLINE short __Pyx_PyInt_AsShort(PyObject *);
+static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);
-static INLINE int __Pyx_PyInt_AsInt(PyObject *);
+static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);
-static INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);
+static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);
-static INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);
+static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);
-static INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);
+static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);
-static INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);
+static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject *);
-static INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);
+static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);
-static INLINE long __Pyx_PyInt_AsLong(PyObject *);
+static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);
-static INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);
+static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);
-static INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);
-
-static INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);
-
static void __Pyx_AddTraceback(const char *funcname); /*proto*/
static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
-
-/* Type declarations */
-
-/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":5
- * include "_pyproj.pxi"
- *
- * cdef class Geod: # <<<<<<<<<<<<<<
- * cdef GEODESIC_T geodesic_t
- * cdef public object geodstring
- */
-
-struct __pyx_obj_5_geod_Geod {
- PyObject_HEAD
- GEODESIC_T geodesic_t;
- PyObject *geodstring;
- PyObject *proj_version;
- char *geodinitstring;
-};
/* Module declarations from _geod */
static PyTypeObject *__pyx_ptype_5_geod_Geod = 0;
-static PyObject *__pyx_k_12 = 0;
-static PyObject *__pyx_k_13 = 0;
-static PyObject *__pyx_k_14 = 0;
#define __Pyx_MODULE_NAME "_geod"
int __pyx_module_is_main__geod = 0;
/* Implementation of _geod */
-static char __pyx_k_11[] = "1.8.6";
-static char __pyx_k___main__[] = "__main__";
-static PyObject *__pyx_kp___main__;
-static char __pyx_k___cinit__[] = "__cinit__";
-static PyObject *__pyx_kp___cinit__;
-static char __pyx_k___reduce__[] = "__reduce__";
-static PyObject *__pyx_kp___reduce__;
-static char __pyx_k__fwd[] = "_fwd";
-static PyObject *__pyx_kp__fwd;
-static char __pyx_k__inv[] = "_inv";
-static PyObject *__pyx_kp__inv;
-static char __pyx_k__npts[] = "_npts";
-static PyObject *__pyx_kp__npts;
-static char __pyx_k_geodstring[] = "geodstring";
-static PyObject *__pyx_kp_geodstring;
-static char __pyx_k_lons[] = "lons";
-static PyObject *__pyx_kp_lons;
-static char __pyx_k_lats[] = "lats";
-static PyObject *__pyx_kp_lats;
-static char __pyx_k_az[] = "az";
-static PyObject *__pyx_kp_az;
-static char __pyx_k_dist[] = "dist";
-static PyObject *__pyx_kp_dist;
-static char __pyx_k_radians[] = "radians";
-static PyObject *__pyx_kp_radians;
-static char __pyx_k_1[] = "lons1";
-static PyObject *__pyx_kp_1;
-static char __pyx_k_2[] = "lats1";
-static PyObject *__pyx_kp_2;
-static char __pyx_k_3[] = "lons2";
-static PyObject *__pyx_kp_3;
-static char __pyx_k_4[] = "lats2";
-static PyObject *__pyx_kp_4;
-static char __pyx_k_5[] = "lon1";
-static PyObject *__pyx_kp_5;
-static char __pyx_k_6[] = "lat1";
-static PyObject *__pyx_kp_6;
-static char __pyx_k_7[] = "lon2";
-static PyObject *__pyx_kp_7;
-static char __pyx_k_8[] = "lat2";
-static PyObject *__pyx_kp_8;
-static char __pyx_k_npts[] = "npts";
-static PyObject *__pyx_kp_npts;
-static char __pyx_k_math[] = "math";
-static PyObject *__pyx_kp_math;
-static char __pyx_k_9[] = "_dg2rad";
-static PyObject *__pyx_kp_9;
-static char __pyx_k_degrees[] = "degrees";
-static PyObject *__pyx_kp_degrees;
-static char __pyx_k_10[] = "_rad2dg";
-static PyObject *__pyx_kp_10;
-static char __pyx_k__doublesize[] = "_doublesize";
-static PyObject *__pyx_kp__doublesize;
-static char __pyx_k___version__[] = "__version__";
-static PyObject *__pyx_kp___version__;
-static char __pyx_k_RuntimeError[] = "RuntimeError";
-static PyObject *__pyx_kp_RuntimeError;
-static char __pyx_k___class__[] = "__class__";
-static PyObject *__pyx_kp___class__;
-static char __pyx_k_ValueError[] = "ValueError";
-static PyObject *__pyx_kp_ValueError;
-static PyObject *__pyx_kp_11;
static PyObject *__pyx_builtin_RuntimeError;
static PyObject *__pyx_builtin_ValueError;
-static PyObject *__pyx_kp_15;
-static PyObject *__pyx_kp_16;
-static char __pyx_k_15[] = "Buffer lengths not the same";
-static char __pyx_k_16[] = "undefined inverse geodesic (may be an antipodal point)";
-static PyObject *__pyx_kp_17;
-static PyObject *__pyx_kp_18;
-static PyObject *__pyx_kp_19;
-static char __pyx_k_17[] = "Buffer lengths not the same";
-static char __pyx_k_18[] = "undefined inverse geodesic (may be an antipodal point)";
-static char __pyx_k_19[] = "undefined inverse geodesic (may be an antipodal point)";
+static char __pyx_k_2[] = "Buffer lengths not the same";
+static char __pyx_k_3[] = "undefined inverse geodesic (may be an antipodal point)";
+static char __pyx_k_6[] = "1.8.7";
+static char __pyx_k_7[] = "Geod.__reduce__ (line 22)";
+static char __pyx_k_8[] = "Geod._fwd (line 26)";
+static char __pyx_k_9[] = "Geod._inv (line 82)";
+static char __pyx_k_10[] = "Geod._npts (line 133)";
+static char __pyx_k__u[] = "u";
+static char __pyx_k__v[] = "v";
+static char __pyx_k__az[] = "az";
+static char __pyx_k__p1[] = "p1";
+static char __pyx_k__p2[] = "p2";
+static char __pyx_k__DIST[] = "DIST";
+static char __pyx_k__Geod[] = "Geod";
+static char __pyx_k___fwd[] = "_fwd";
+static char __pyx_k___inv[] = "_inv";
+static char __pyx_k__dist[] = "dist";
+static char __pyx_k__lat1[] = "lat1";
+static char __pyx_k__lat2[] = "lat2";
+static char __pyx_k__lats[] = "lats";
+static char __pyx_k__lon1[] = "lon1";
+static char __pyx_k__lon2[] = "lon2";
+static char __pyx_k__lons[] = "lons";
+static char __pyx_k__math[] = "math";
+static char __pyx_k__npts[] = "npts";
+static char __pyx_k___npts[] = "_npts";
+static char __pyx_k__lats1[] = "lats1";
+static char __pyx_k__lats2[] = "lats2";
+static char __pyx_k__lons1[] = "lons1";
+static char __pyx_k__lons2[] = "lons2";
+static char __pyx_k__ALPHA12[] = "ALPHA12";
+static char __pyx_k__ALPHA21[] = "ALPHA21";
+static char __pyx_k___dg2rad[] = "_dg2rad";
+static char __pyx_k___rad2dg[] = "_rad2dg";
+static char __pyx_k__degrees[] = "degrees";
+static char __pyx_k__radians[] = "radians";
+static char __pyx_k____main__[] = "__main__";
+static char __pyx_k____test__[] = "__test__";
+static char __pyx_k____class__[] = "__class__";
+static char __pyx_k__ValueError[] = "ValueError";
+static char __pyx_k____reduce__[] = "__reduce__";
+static char __pyx_k__geodesic_t[] = "geodesic_t";
+static char __pyx_k__geodstring[] = "geodstring";
+static char __pyx_k____version__[] = "__version__";
+static char __pyx_k___doublesize[] = "_doublesize";
+static char __pyx_k__RuntimeError[] = "RuntimeError";
+static char __pyx_k__proj_version[] = "proj_version";
+static char __pyx_k__geodinitstring[] = "geodinitstring";
+static PyObject *__pyx_kp_u_10;
+static PyObject *__pyx_kp_s_2;
+static PyObject *__pyx_kp_s_3;
+static PyObject *__pyx_kp_s_6;
+static PyObject *__pyx_kp_u_7;
+static PyObject *__pyx_kp_u_8;
+static PyObject *__pyx_kp_u_9;
+static PyObject *__pyx_n_s__ALPHA12;
+static PyObject *__pyx_n_s__ALPHA21;
+static PyObject *__pyx_n_s__DIST;
+static PyObject *__pyx_n_s__Geod;
+static PyObject *__pyx_n_s__RuntimeError;
+static PyObject *__pyx_n_s__ValueError;
+static PyObject *__pyx_n_s____class__;
+static PyObject *__pyx_n_s____main__;
+static PyObject *__pyx_n_s____reduce__;
+static PyObject *__pyx_n_s____test__;
+static PyObject *__pyx_n_s____version__;
+static PyObject *__pyx_n_s___dg2rad;
+static PyObject *__pyx_n_s___doublesize;
+static PyObject *__pyx_n_s___fwd;
+static PyObject *__pyx_n_s___inv;
+static PyObject *__pyx_n_s___npts;
+static PyObject *__pyx_n_s___rad2dg;
+static PyObject *__pyx_n_s__az;
+static PyObject *__pyx_n_s__degrees;
+static PyObject *__pyx_n_s__dist;
+static PyObject *__pyx_n_s__geodesic_t;
+static PyObject *__pyx_n_s__geodinitstring;
+static PyObject *__pyx_n_s__geodstring;
+static PyObject *__pyx_n_s__lat1;
+static PyObject *__pyx_n_s__lat2;
+static PyObject *__pyx_n_s__lats;
+static PyObject *__pyx_n_s__lats1;
+static PyObject *__pyx_n_s__lats2;
+static PyObject *__pyx_n_s__lon1;
+static PyObject *__pyx_n_s__lon2;
+static PyObject *__pyx_n_s__lons;
+static PyObject *__pyx_n_s__lons1;
+static PyObject *__pyx_n_s__lons2;
+static PyObject *__pyx_n_s__math;
+static PyObject *__pyx_n_s__npts;
+static PyObject *__pyx_n_s__p1;
+static PyObject *__pyx_n_s__p2;
+static PyObject *__pyx_n_s__proj_version;
+static PyObject *__pyx_n_s__radians;
+static PyObject *__pyx_n_s__u;
+static PyObject *__pyx_n_s__v;
+static PyObject *__pyx_k_1;
+static PyObject *__pyx_k_4;
+static PyObject *__pyx_k_5;
-/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":11
+/* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":11
* cdef char *geodinitstring
*
* def __new__(self, geodstring): # <<<<<<<<<<<<<<
@@ -430,8 +523,8 @@
int __pyx_t_1;
PyObject *__pyx_t_2 = NULL;
PyObject *__pyx_t_3 = NULL;
- static PyObject **__pyx_pyargnames[] = {&__pyx_kp_geodstring,0};
- __Pyx_SetupRefcountContext("__cinit__");
+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__geodstring,0};
+ __Pyx_RefNannySetupContext("__cinit__");
if (unlikely(__pyx_kwds)) {
Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
PyObject* values[1] = {0};
@@ -442,7 +535,7 @@
}
switch (PyTuple_GET_SIZE(__pyx_args)) {
case 0:
- values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_geodstring);
+ values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__geodstring);
if (likely(values[0])) kw_args--;
else goto __pyx_L5_argtuple_error;
}
@@ -462,8 +555,10 @@
__Pyx_AddTraceback("_geod.Geod.__cinit__");
return -1;
__pyx_L4_argument_unpacking_done:;
+ __Pyx_INCREF((PyObject *)__pyx_v_self);
+ __Pyx_INCREF(__pyx_v_geodstring);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":14
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":14
* cdef GEODESIC_T GEOD_T
* # setup geod initialization string.
* self.geodstring = geodstring # <<<<<<<<<<<<<<
@@ -476,7 +571,7 @@
__Pyx_DECREF(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring);
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring = __pyx_v_geodstring;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":15
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":15
* # setup geod initialization string.
* self.geodstring = geodstring
* self.geodinitstring = PyString_AsString(self.geodstring) # <<<<<<<<<<<<<<
@@ -485,7 +580,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodinitstring = PyString_AsString(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":17
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":17
* self.geodinitstring = PyString_AsString(self.geodstring)
* # initialize projection
* self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0] # <<<<<<<<<<<<<<
@@ -494,7 +589,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/matplotlib/basemap/src/_geod.pyx":18
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":18
* # initialize projection
* self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0]
* if pj_errno != 0: # <<<<<<<<<<<<<<
@@ -504,7 +599,7 @@
__pyx_t_1 = (pj_errno != 0);
if (__pyx_t_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":19
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":19
* self.geodesic_t = GEOD_init_plus(self.geodinitstring, &GEOD_T)[0]
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno)) # <<<<<<<<<<<<<<
@@ -512,15 +607,15 @@
*
*/
__pyx_t_2 = __Pyx_PyBytes_FromString(pj_strerrno(pj_errno)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_2);
+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));
__pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_3));
- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
- __Pyx_GIVEREF(__pyx_t_2);
+ __Pyx_GOTREF(__pyx_t_3);
+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_2));
+ __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
__pyx_t_2 = 0;
- __pyx_t_2 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_2 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_2);
- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_Raise(__pyx_t_2, 0, 0);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -528,7 +623,7 @@
}
__pyx_L6:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":20
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":20
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno))
* self.proj_version = PJ_VERSION/100. # <<<<<<<<<<<<<<
@@ -551,11 +646,13 @@
__Pyx_AddTraceback("_geod.Geod.__cinit__");
__pyx_r = -1;
__pyx_L0:;
- __Pyx_FinishRefcountContext();
+ __Pyx_DECREF((PyObject *)__pyx_v_self);
+ __Pyx_DECREF(__pyx_v_geodstring);
+ __Pyx_RefNannyFinishContext();
return __pyx_r;
}
-/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":22
+/* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":22
* self.proj_version = PJ_VERSION/100.
*
* def __reduce__(self): # <<<<<<<<<<<<<<
@@ -570,9 +667,9 @@
PyObject *__pyx_t_1 = NULL;
PyObject *__pyx_t_2 = NULL;
PyObject *__pyx_t_3 = NULL;
- __Pyx_SetupRefcountContext("__reduce__");
+ __Pyx_RefNannySetupContext("__reduce__");
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":24
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":24
* def __reduce__(self):
* """special method that allows pyproj.Geod instance to be pickled"""
* return (self.__class__,(self.geodstring,)) # <<<<<<<<<<<<<<
@@ -580,22 +677,22 @@
* def _fwd(self, object lons, object lats, object az, object dist, radians=False):
*/
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_kp___class__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s____class__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_1);
__pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+ __Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring);
PyTuple_SET_ITEM(__pyx_t_2, 0, ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring);
__Pyx_GIVEREF(((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodstring);
__pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+ __Pyx_GOTREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);
__Pyx_GIVEREF(__pyx_t_1);
- PyTuple_SET_ITEM(__pyx_t_3, 1, ((PyObject *)__pyx_t_2));
- __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+ PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2);
+ __Pyx_GIVEREF(__pyx_t_2);
__pyx_t_1 = 0;
__pyx_t_2 = 0;
- __pyx_r = ((PyObject *)__pyx_t_3);
+ __pyx_r = __pyx_t_3;
__pyx_t_3 = 0;
goto __pyx_L0;
@@ -609,11 +706,11 @@
__pyx_r = NULL;
__pyx_L0:;
__Pyx_XGIVEREF(__pyx_r);
- __Pyx_FinishRefcountContext();
+ __Pyx_RefNannyFinishContext();
return __pyx_r;
}
-/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":26
+/* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":26
* return (self.__class__,(self.geodstring,))
*
* def _fwd(self, object lons, object lats, object az, object dist, radians=False): # <<<<<<<<<<<<<<
@@ -644,19 +741,19 @@
void *__pyx_v_azdat;
void *__pyx_v_distdat;
PyObject *__pyx_r = NULL;
- PyObject *__pyx_1 = 0;
int __pyx_t_1;
int __pyx_t_2;
PyObject *__pyx_t_3 = NULL;
PyObject *__pyx_t_4 = NULL;
- Py_ssize_t __pyx_t_5;
- double __pyx_t_6;
- static PyObject **__pyx_pyargnames[] = {&__pyx_kp_lons,&__pyx_kp_lats,&__pyx_kp_az,&__pyx_kp_dist,&__pyx_kp_radians,0};
- __Pyx_SetupRefcountContext("_fwd");
+ PyObject *__pyx_t_5 = NULL;
+ Py_ssize_t __pyx_t_6;
+ double __pyx_t_7;
+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__lons,&__pyx_n_s__lats,&__pyx_n_s__az,&__pyx_n_s__dist,&__pyx_n_s__radians,0};
+ __Pyx_RefNannySetupContext("_fwd");
if (unlikely(__pyx_kwds)) {
Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
PyObject* values[5] = {0,0,0,0,0};
- values[4] = __pyx_k_12;
+ values[4] = __pyx_k_1;
switch (PyTuple_GET_SIZE(__pyx_args)) {
case 5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
case 4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
@@ -668,30 +765,30 @@
}
switch (PyTuple_GET_SIZE(__pyx_args)) {
case 0:
- values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_lons);
+ values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__lons);
if (likely(values[0])) kw_args--;
else goto __pyx_L5_argtuple_error;
case 1:
- values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_lats);
+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__lats);
if (likely(values[1])) kw_args--;
else {
__Pyx_RaiseArgtupleInvalid("_fwd", 0, 4, 5, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
}
case 2:
- values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_az);
+ values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__az);
if (likely(values[2])) kw_args--;
else {
__Pyx_RaiseArgtupleInvalid("_fwd", 0, 4, 5, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
}
case 3:
- values[3] = PyDict_GetItem(__pyx_kwds, __pyx_kp_dist);
+ values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__dist);
if (likely(values[3])) kw_args--;
else {
__Pyx_RaiseArgtupleInvalid("_fwd", 0, 4, 5, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
}
case 4:
if (kw_args > 1) {
- PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_radians);
+ PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__radians);
if (unlikely(value)) { values[4] = value; kw_args--; }
}
}
@@ -704,7 +801,7 @@
__pyx_v_dist = values[3];
__pyx_v_radians = values[4];
} else {
- __pyx_v_radians = __pyx_k_12;
+ __pyx_v_radians = __pyx_k_1;
switch (PyTuple_GET_SIZE(__pyx_args)) {
case 5:
__pyx_v_radians = PyTuple_GET_ITEM(__pyx_args, 4);
@@ -724,8 +821,14 @@
__Pyx_AddTraceback("_geod.Geod._fwd");
return NULL;
__pyx_L4_argument_unpacking_done:;
+ __Pyx_INCREF((PyObject *)__pyx_v_self);
+ __Pyx_INCREF(__pyx_v_lons);
+ __Pyx_INCREF(__pyx_v_lats);
+ __Pyx_INCREF(__pyx_v_az);
+ __Pyx_INCREF(__pyx_v_dist);
+ __Pyx_INCREF(__pyx_v_radians);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":37
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":37
* cdef void *londata, *latdata, *azdat, *distdat
* # if buffer api is supported, get pointer to data buffers.
* if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0: # <<<<<<<<<<<<<<
@@ -735,7 +838,7 @@
__pyx_t_1 = (PyObject_AsWriteBuffer(__pyx_v_lons, (&__pyx_v_londata), (&__pyx_v_buflenlons)) != 0);
if (__pyx_t_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":38
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":38
* # if buffer api is supported, get pointer to data buffers.
* if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -748,7 +851,7 @@
}
__pyx_L6:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":39
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":39
* if PyObject_AsWriteBuffer(lons, &londata, &buflenlons) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0: # <<<<<<<<<<<<<<
@@ -758,7 +861,7 @@
__pyx_t_1 = (PyObject_AsWriteBuffer(__pyx_v_lats, (&__pyx_v_latdata), (&__pyx_v_buflenlats)) != 0);
if (__pyx_t_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":40
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":40
* raise RuntimeError
* if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -771,7 +874,7 @@
}
__pyx_L7:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":41
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":41
* if PyObject_AsWriteBuffer(lats, &latdata, &buflenlats) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0: # <<<<<<<<<<<<<<
@@ -781,7 +884,7 @@
__pyx_t_1 = (PyObject_AsWriteBuffer(__pyx_v_az, (&__pyx_v_azdat), (&__pyx_v_buflenaz)) != 0);
if (__pyx_t_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":42
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":42
* raise RuntimeError
* if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -794,7 +897,7 @@
}
__pyx_L8:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":43
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":43
* if PyObject_AsWriteBuffer(az, &azdat, &buflenaz) <> 0:
* raise RuntimeError
* if PyObject_AsWriteBuffer(dist, &distdat, &buflend) <> 0: # <<<<<<<<<<<<<<
@@ -804,7 +907,7 @@
__pyx_t_1 = (PyObject_AsWriteBuffer(__pyx_v_dist, (&__pyx_v_distdat), (&__pyx_v_buflend)) != 0);
if (__pyx_t_1) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":44
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":44
* raise RuntimeError
* if PyObject_AsWriteBuffer(dist, &distdat, &buflend) <> 0:
* raise RuntimeError # <<<<<<<<<<<<<<
@@ -817,7 +920,7 @@
}
__pyx_L9:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":46
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":46
* raise RuntimeError
* # process data in buffer
* if not buflenlons == buflenlats == buflenaz == buflend: # <<<<<<<<<<<<<<
@@ -834,7 +937,7 @@
__pyx_t_2 = (!__pyx_t_1);
if (__pyx_t_2) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":47
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":47
* # process data in buffer
* if not buflenlons == buflenlats == buflenaz == buflend:
* raise RuntimeError("Buffer lengths not the same") # <<<<<<<<<<<<<<
@@ -842,13 +945,13 @@
* lonsdata = <double *>londata
*/
__pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_3));
- __Pyx_INCREF(__pyx_kp_15);
- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_15);
- __Pyx_GIVEREF(__pyx_kp_15);
- __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_3);
+ __Pyx_INCREF(((PyObject *)__pyx_kp_s_2));
+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_2));
+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_2));
+ __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_4);
- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_Raise(__pyx_t_4, 0, 0);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -856,7 +959,7 @@
}
__pyx_L10:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":48
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":48
* if not buflenlons == buflenlats == buflenaz == buflend:
* raise RuntimeError("Buffer lengths not the same")
* ndim = buflenlons/_doublesize # <<<<<<<<<<<<<<
@@ -865,17 +968,17 @@
*/
__pyx_t_4 = PyInt_FromSsize_t(__pyx_v_buflenlons); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_4);
- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp__doublesize); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_1);
- __pyx_t_3 = __Pyx_PyNumber_Divide(__pyx_t_4, __pyx_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s___doublesize); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_3);
+ __pyx_t_5 = __Pyx_PyNumber_Divide(__pyx_t_4, __pyx_t_3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
- __pyx_t_5 = __Pyx_PyIndex_AsSsize_t(__pyx_t_3); if (unlikely((__pyx_t_5 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_v_ndim = __pyx_t_5;
+ __pyx_t_6 = __Pyx_PyIndex_AsSsize_t(__pyx_t_5); if (unlikely((__pyx_t_6 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ __pyx_v_ndim = __pyx_t_6;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":49
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":49
* raise RuntimeError("Buffer lengths not the same")
* ndim = buflenlons/_doublesize
* lonsdata = <double *>londata # <<<<<<<<<<<<<<
@@ -884,7 +987,7 @@
*/
__pyx_v_lonsdata = ((double *)__pyx_v_londata);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":50
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":50
* ndim = buflenlons/_doublesize
* lonsdata = <double *>londata
* latsdata = <double *>latdata # <<<<<<<<<<<<<<
@@ -893,7 +996,7 @@
*/
__pyx_v_latsdata = ((double *)__pyx_v_latdata);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":51
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":51
* lonsdata = <double *>londata
* latsdata = <double *>latdata
* azdata = <double *>azdat # <<<<<<<<<<<<<<
@@ -902,7 +1005,7 @@
*/
__pyx_v_azdata = ((double *)__pyx_v_azdat);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":52
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":52
* latsdata = <double *>latdata
* azdata = <double *>azdat
* distdata = <double *>distdat # <<<<<<<<<<<<<<
@@ -911,17 +1014,17 @@
*/
__pyx_v_distdata = ((double *)__pyx_v_distdat);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":53
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":53
* azdata = <double *>azdat
* distdata = <double *>distdat
* for i from 0 <= i < ndim: # <<<<<<<<<<<<<<
* if radians:
* self.geodesic_t.p1.v = lonsdata[i]
*/
- __pyx_t_5 = __pyx_v_ndim;
- for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
+ __pyx_t_6 = __pyx_v_ndim;
+ for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_6; __pyx_v_i++) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":54
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":54
* distdata = <double *>distdat
* for i from 0 <= i < ndim:
* if radians: # <<<<<<<<<<<<<<
@@ -931,7 +1034,7 @@
__pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_radians); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
if (__pyx_t_2) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":55
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":55
* for i from 0 <= i < ndim:
* if radians:
* self.geodesic_t.p1.v = lonsdata[i] # <<<<<<<<<<<<<<
@@ -940,7 +1043,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = (__pyx_v_lonsdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":56
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":56
* if radians:
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i] # <<<<<<<<<<<<<<
@@ -949,7 +1052,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = (__pyx_v_latsdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":57
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":57
* self.geodesic_t.p1.v = lonsdata[i]
* self.geodesic_t.p1.u = latsdata[i]
* self.geodesic_t.ALPHA12 = azdata[i] # <<<<<<<<<<<<<<
@@ -958,7 +1061,7 @@
*/
((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12 = (__pyx_v_azdata[__pyx_v_i]);
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":58
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":58
* self.geodesic_t.p1.u = latsdata[i]
* self.geodesic_t.ALPHA12 = azdata[i]
* self.geodesic_t.DIST = distdata[i] # <<<<<<<<<<<<<<
@@ -970,64 +1073,64 @@
}
/*else*/ {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":60
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":60
* self.geodesic_t.DIST = distdata[i]
* else:
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i] # <<<<<<<<<<<<<<
* self.geodesic_t.p1.u = _dg2rad*latsdata[i]
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
*/
- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_9); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_1);
+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s___dg2rad); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
__pyx_t_3 = PyFloat_FromDouble((__pyx_v_lonsdata[__pyx_v_i])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = PyNumber_Multiply(__pyx_1, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_4 = PyNumber_Multiply(__pyx_t_5, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_4);
- __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_6 = __pyx_PyFloat_AsDouble(__pyx_t_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_7 = __pyx_PyFloat_AsDouble(__pyx_t_4); if (unlikely((__pyx_t_7 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_t_6;
+ ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.v = __pyx_t_7;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":61
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":61
* else:
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
* self.geodesic_t.p1.u = _dg2rad*latsdata[i] # <<<<<<<<<<<<<<
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
* self.geodesic_t.DIST = distdata[i]
*/
- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_9); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_1);
- __pyx_t_4 = PyFloat_FromDouble((__pyx_v_latsdata[__pyx_v_i])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s___dg2rad); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_3 = PyNumber_Multiply(__pyx_1, __pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_3 = PyFloat_FromDouble((__pyx_v_latsdata[__pyx_v_i])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_3);
- __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+ __pyx_t_5 = PyNumber_Multiply(__pyx_t_4, __pyx_t_3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_6 = __pyx_PyFloat_AsDouble(__pyx_t_3); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_t_6;
+ __pyx_t_7 = __pyx_PyFloat_AsDouble(__pyx_t_5); if (unlikely((__pyx_t_7 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+ ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.p1.u = __pyx_t_7;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":62
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":62
* self.geodesic_t.p1.v = _dg2rad*lonsdata[i]
* self.geodesic_t.p1.u = _dg2rad*latsdata[i]
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i] # <<<<<<<<<<<<<<
* self.geodesic_t.DIST = distdata[i]
* geod_pre(&self.geodesic_t)
*/
- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_9); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_1);
+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s___dg2rad); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_5);
__pyx_t_3 = PyFloat_FromDouble((__pyx_v_azdata[__pyx_v_i])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = PyNumber_Multiply(__pyx_1, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_4 = PyNumber_Multiply(__pyx_t_5, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_4);
- __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_6 = __pyx_PyFloat_AsDouble(__pyx_t_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_7 = __pyx_PyFloat_AsDouble(__pyx_t_4); if (unlikely((__pyx_t_7 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12 = __pyx_t_6;
+ ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA12 = __pyx_t_7;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":63
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":63
* self.geodesic_t.p1.u = _dg2rad*latsdata[i]
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
* self.geodesic_t.DIST = distdata[i] # <<<<<<<<<<<<<<
@@ -1038,7 +1141,7 @@
}
__pyx_L13:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":64
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":64
* self.geodesic_t.ALPHA12 = _dg2rad*azdata[i]
* self.geodesic_t.DIST = distdata[i]
* geod_pre(&self.geodesic_t) # <<<<<<<<<<<<<<
@@ -1047,7 +1150,7 @@
*/
geod_pre((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":65
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":65
* self.geodesic_t.DIST = distdata[i]
* geod_pre(&self.geodesic_t)
* if pj_errno != 0: # <<<<<<<<<<<<<<
@@ -1057,7 +1160,7 @@
__pyx_t_2 = (pj_errno != 0);
if (__pyx_t_2) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":66
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":66
* geod_pre(&self.geodesic_t)
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno)) # <<<<<<<<<<<<<<
@@ -1065,15 +1168,15 @@
* if pj_errno != 0:
*/
__pyx_t_4 = __Pyx_PyBytes_FromString(pj_strerrno(pj_errno)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_GOTREF(((PyObject *)__pyx_t_4));
__pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_3));
- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4);
- __Pyx_GIVEREF(__pyx_t_4);
+ __Pyx_GOTREF(__pyx_t_3);
+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_4));
+ __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
__pyx_t_4 = 0;
- __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_4);
- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_Raise(__pyx_t_4, 0, 0);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1081,7 +1184,7 @@
}
__pyx_L14:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":67
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":67
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno))
* geod_for(&self.geodesic_t) # <<<<<<<<<<<<<<
@@ -1090,7 +1193,7 @@
*/
geod_for((&((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t));
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":68
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":68
* raise RuntimeError(pj_strerrno(pj_errno))
* geod_for(&self.geodesic_t)
* if pj_errno != 0: # <<<<<<<<<<<<<<
@@ -1100,7 +1203,7 @@
__pyx_t_2 = (pj_errno != 0);
if (__pyx_t_2) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":69
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":69
* geod_for(&self.geodesic_t)
* if pj_errno != 0:
* raise RuntimeError(pj_strerrno(pj_errno)) # <<<<<<<<<<<<<<
@@ -1108,15 +1211,15 @@
* if self.geodesic_t.ALPHA21 != self.geodesic_t.ALPHA21:
*/
__pyx_t_4 = __Pyx_PyBytes_FromString(pj_strerrno(pj_errno)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_GOTREF(((PyObject *)__pyx_t_4));
__pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_3));
- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4);
- __Pyx_GIVEREF(__pyx_t_4);
+ __Pyx_GOTREF(__pyx_t_3);
+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_4));
+ __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
__pyx_t_4 = 0;
- __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_4);
- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_Raise(__pyx_t_4, 0, 0);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
{__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1124,7 +1227,7 @@
}
__pyx_L15:;
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":71
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":71
* raise RuntimeError(pj_strerrno(pj_errno))
* # check for NaN.
* if self.geodesic_t.ALPHA21 != self.geodesic_t.ALPHA21: # <<<<<<<<<<<<<<
@@ -1134,7 +1237,7 @@
__pyx_t_2 = (((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA21 != ((struct __pyx_obj_5_geod_Geod *)__pyx_v_self)->geodesic_t.ALPHA21);
if (__pyx_t_2) {
- /* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geod.pyx":72
+ /* "/Volumes/User/jwhitaker/python/pyproj/_geod.pyx":72
* # check for NaN.
* if self.geodesic_t.ALPHA21 != self.geodesic_t.ALPHA21:
* raise ValueError('undefined inverse geodesic (may be an antipodal point)') # <<<<<<<<<<<<<<
@@ -1142,13 +1245,13 @@
* lonsdata[i] = self.geodesic_t.p2.v
*/
__pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(((PyObject *)__pyx_t_4));
- __Pyx_INCREF(__pyx_kp_16);
- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_16);
- __Pyx_GIVEREF(__pyx_kp_16);
- __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __Pyx_GOTREF(__pyx_t_4);
+ __Pyx_INCREF(((PyObject *)__pyx_kp_s_3));
...
[truncated message content] |
