[python-pyproj] 01/04: Imported Upstream version 1.9.5.1
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Jan 6 22:57:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository python-pyproj.
commit a8d7be3fc4b6757d1694a01c68ba6783e9412ebb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Jan 6 23:52:28 2016 +0100
Imported Upstream version 1.9.5.1
---
.travis.yml | 1 +
Changelog | 2 ++
_proj.c | 28 +++++++++---------
_proj.pyx | 2 +-
docs/api-objects.txt | 14 +++++----
docs/class-tree.html | 2 +-
docs/help.html | 2 +-
docs/identifier-index.html | 27 ++++++++++++-----
docs/index.html | 72 +++++++++++++++++++++++++++------------------
docs/module-tree.html | 2 +-
docs/pyproj-module.html | 72 +++++++++++++++++++++++++++------------------
docs/pyproj.Geod-class.html | 20 ++++++-------
docs/pyproj.Proj-class.html | 36 +++++++++++++----------
setup.py | 2 +-
src/pj_strtod.c | 6 ++++
15 files changed, 172 insertions(+), 116 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6359d29..341322e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ install:
script:
- python -c "import pyproj; pyproj.test()"
- python -c "import pyproj; pyproj.Proj(init='epsg:4269')"
+ - python unittest/test.py -v
notifications:
email: false
diff --git a/Changelog b/Changelog
index 7c57cdb..832dd73 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+1.9.5.1
+* fix for issue #42 (compilation error with microsoft visual studio).
1.9.5
* update proj4 source to latest github master (commit
953cc00fd87425395cabe37641cda905c4b587c1).
diff --git a/_proj.c b/_proj.c
index 437a18a..5058cb3 100644
--- a/_proj.c
+++ b/_proj.c
@@ -692,7 +692,6 @@ static char __pyx_k_math[] = "math";
static char __pyx_k_npts[] = "npts";
static char __pyx_k_proj[] = "_proj";
static char __pyx_k_test[] = "__test__";
-static char __pyx_k_1_9_5[] = "1.9.5";
static char __pyx_k_ascii[] = "ascii";
static char __pyx_k_class[] = "__class__";
static char __pyx_k_lats1[] = "lats1";
@@ -704,6 +703,7 @@ static char __pyx_k_ydata[] = "ydata";
static char __pyx_k_zdata[] = "zdata";
static char __pyx_k_encode[] = "encode";
static char __pyx_k_import[] = "__import__";
+static char __pyx_k_1_9_5_1[] = "1.9.5.1";
static char __pyx_k_a_s_f_s[] = "+a=%s +f=%s";
static char __pyx_k_buflenx[] = "buflenx";
static char __pyx_k_bufleny[] = "bufleny";
@@ -727,14 +727,14 @@ static char __pyx_k_AttributeError[] = "AttributeError";
static char __pyx_k_projection_undefined[] = "projection undefined";
static char __pyx_k_Buffer_lengths_not_the_same[] = "Buffer lengths not the same";
static char __pyx_k_x_y_and_z_must_be_same_size[] = "x,y and z must be same size";
-static char __pyx_k_Users_jsw_python_pyproj_git__pr[] = "/Users/jsw/python/pyproj.git/_proj.pyx";
+static char __pyx_k_Volumes_Drobo_python_pyproj_git[] = "/Volumes/Drobo/python/pyproj.git/_proj.pyx";
static char __pyx_k_undefined_inverse_geodesic_may_b[] = "undefined inverse geodesic (may be an antipodal point)";
-static PyObject *__pyx_kp_s_1_9_5;
+static PyObject *__pyx_kp_s_1_9_5_1;
static PyObject *__pyx_n_s_AttributeError;
static PyObject *__pyx_kp_s_Buffer_lengths_not_the_same;
static PyObject *__pyx_n_s_RuntimeError;
-static PyObject *__pyx_kp_s_Users_jsw_python_pyproj_git__pr;
static PyObject *__pyx_n_s_ValueError;
+static PyObject *__pyx_kp_s_Volumes_Drobo_python_pyproj_git;
static PyObject *__pyx_n_s_a;
static PyObject *__pyx_kp_s_a_s_f_s;
static PyObject *__pyx_n_s_ascii;
@@ -6384,12 +6384,12 @@ static struct PyModuleDef __pyx_moduledef = {
#endif
static __Pyx_StringTabEntry __pyx_string_tab[] = {
- {&__pyx_kp_s_1_9_5, __pyx_k_1_9_5, sizeof(__pyx_k_1_9_5), 0, 0, 1, 0},
+ {&__pyx_kp_s_1_9_5_1, __pyx_k_1_9_5_1, sizeof(__pyx_k_1_9_5_1), 0, 0, 1, 0},
{&__pyx_n_s_AttributeError, __pyx_k_AttributeError, sizeof(__pyx_k_AttributeError), 0, 0, 1, 1},
{&__pyx_kp_s_Buffer_lengths_not_the_same, __pyx_k_Buffer_lengths_not_the_same, sizeof(__pyx_k_Buffer_lengths_not_the_same), 0, 0, 1, 0},
{&__pyx_n_s_RuntimeError, __pyx_k_RuntimeError, sizeof(__pyx_k_RuntimeError), 0, 0, 1, 1},
- {&__pyx_kp_s_Users_jsw_python_pyproj_git__pr, __pyx_k_Users_jsw_python_pyproj_git__pr, sizeof(__pyx_k_Users_jsw_python_pyproj_git__pr), 0, 0, 1, 0},
{&__pyx_n_s_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 0, 0, 1, 1},
+ {&__pyx_kp_s_Volumes_Drobo_python_pyproj_git, __pyx_k_Volumes_Drobo_python_pyproj_git, sizeof(__pyx_k_Volumes_Drobo_python_pyproj_git), 0, 0, 1, 0},
{&__pyx_n_s_a, __pyx_k_a, sizeof(__pyx_k_a), 0, 0, 1, 1},
{&__pyx_kp_s_a_s_f_s, __pyx_k_a_s_f_s, sizeof(__pyx_k_a_s_f_s), 0, 0, 1, 0},
{&__pyx_n_s_ascii, __pyx_k_ascii, sizeof(__pyx_k_ascii), 0, 0, 1, 1},
@@ -6622,7 +6622,7 @@ static int __Pyx_InitCachedConstants(void) {
* _dg2rad = math.radians(1.)
* _rad2dg = math.degrees(1.) # <<<<<<<<<<<<<<
* _doublesize = sizeof(double)
- * __version__ = "1.9.5"
+ * __version__ = "1.9.5.1"
*/
__pyx_tuple__15 = PyTuple_Pack(1, __pyx_float_1_); if (unlikely(!__pyx_tuple__15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_tuple__15);
@@ -6638,7 +6638,7 @@ static int __Pyx_InitCachedConstants(void) {
__pyx_tuple__16 = PyTuple_Pack(3, __pyx_n_s_datapath, __pyx_n_s_bytestr, __pyx_n_s_searchpath); if (unlikely(!__pyx_tuple__16)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_tuple__16);
__Pyx_GIVEREF(__pyx_tuple__16);
- __pyx_codeobj__17 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__16, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_Users_jsw_python_pyproj_git__pr, __pyx_n_s_set_datapath, 58, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__17)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_codeobj__17 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__16, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_Volumes_Drobo_python_pyproj_git, __pyx_n_s_set_datapath, 58, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__17)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
/* "_proj.pyx":63
* pj_set_searchpath(1, &searchpath)
@@ -6650,7 +6650,7 @@ static int __Pyx_InitCachedConstants(void) {
__pyx_tuple__18 = PyTuple_Pack(1, __pyx_n_s_projstring); if (unlikely(!__pyx_tuple__18)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_tuple__18);
__Pyx_GIVEREF(__pyx_tuple__18);
- __pyx_codeobj__19 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__18, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_Users_jsw_python_pyproj_git__pr, __pyx_n_s_createproj, 63, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__19)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_codeobj__19 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__18, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_Volumes_Drobo_python_pyproj_git, __pyx_n_s_createproj, 63, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__19)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
/* "_proj.pyx":326
* return False
@@ -6662,7 +6662,7 @@ static int __Pyx_InitCachedConstants(void) {
__pyx_tuple__20 = PyTuple_Pack(18, __pyx_n_s_p1, __pyx_n_s_p2, __pyx_n_s_inx, __pyx_n_s_iny, __pyx_n_s_inz, __pyx_n_s_radians, __pyx_n_s_xdata, __pyx_n_s_ydata, __pyx_n_s_zdata, __pyx_n_s_xx, __pyx_n_s_yy, __pyx_n_s_zz, __pyx_n_s_buflenx, __pyx_n_s_bufleny, __pyx_n_s_buflenz, __pyx_n_s_npts, __pyx_n_s_i, __pyx_n_s_err); if (unlikely(!__pyx_tuple__20)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_tuple__20);
__Pyx_GIVEREF(__pyx_tuple__20);
- __pyx_codeobj__21 = (PyObject*)__Pyx_PyCode_New(6, 0, 18, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__20, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_Users_jsw_python_pyproj_git__pr, __pyx_n_s_transform, 326, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__21)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ __pyx_codeobj__21 = (PyObject*)__Pyx_PyCode_New(6, 0, 18, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__20, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_Volumes_Drobo_python_pyproj_git, __pyx_n_s_transform, 326, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__21)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_RefNannyFinishContext();
return 0;
__pyx_L1_error:;
@@ -6818,7 +6818,7 @@ PyMODINIT_FUNC PyInit__proj(void)
* _dg2rad = math.radians(1.)
* _rad2dg = math.degrees(1.) # <<<<<<<<<<<<<<
* _doublesize = sizeof(double)
- * __version__ = "1.9.5"
+ * __version__ = "1.9.5.1"
*/
__pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_math); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
__Pyx_GOTREF(__pyx_t_1);
@@ -6836,7 +6836,7 @@ PyMODINIT_FUNC PyInit__proj(void)
* _dg2rad = math.radians(1.)
* _rad2dg = math.degrees(1.)
* _doublesize = sizeof(double) # <<<<<<<<<<<<<<
- * __version__ = "1.9.5"
+ * __version__ = "1.9.5.1"
*
*/
__pyx_t_1 = __Pyx_PyInt_FromSize_t((sizeof(double))); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -6847,11 +6847,11 @@ PyMODINIT_FUNC PyInit__proj(void)
/* "_proj.pyx":11
* _rad2dg = math.degrees(1.)
* _doublesize = sizeof(double)
- * __version__ = "1.9.5" # <<<<<<<<<<<<<<
+ * __version__ = "1.9.5.1" # <<<<<<<<<<<<<<
*
* cdef extern from "math.h":
*/
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_version, __pyx_kp_s_1_9_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_version, __pyx_kp_s_1_9_5_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
/* "_proj.pyx":58
* int PyObject_AsWriteBuffer(object, void **rbuf, Py_ssize_t *len)
diff --git a/_proj.pyx b/_proj.pyx
index a1ed53f..5325472 100644
--- a/_proj.pyx
+++ b/_proj.pyx
@@ -8,7 +8,7 @@ cdef double _dg2rad, _rad2dg
_dg2rad = math.radians(1.)
_rad2dg = math.degrees(1.)
_doublesize = sizeof(double)
-__version__ = "1.9.5"
+__version__ = "1.9.5.1"
cdef extern from "math.h":
cdef enum:
diff --git a/docs/api-objects.txt b/docs/api-objects.txt
index c4744dd..9e930a7 100644
--- a/docs/api-objects.txt
+++ b/docs/api-objects.txt
@@ -1,14 +1,16 @@
pyproj pyproj-module.html
-pyproj._dict2string pyproj-module.html#_dict2string
-pyproj._copytobuffer_return_scalar pyproj-module.html#_copytobuffer_return_scalar
-pyproj.pj_ellps pyproj-module.html#pj_ellps
-pyproj.pyproj_datadir pyproj-module.html#pyproj_datadir
pyproj.__package__ pyproj-module.html#__package__
+pyproj.pj_ellps pyproj-module.html#pj_ellps
+pyproj.pj_list pyproj-module.html#pj_list
pyproj.transform pyproj-module.html#transform
+pyproj.__loader__ pyproj-module.html#__loader__
+pyproj.test pyproj-module.html#test
pyproj._copytobuffer pyproj-module.html#_copytobuffer
pyproj._convertback pyproj-module.html#_convertback
-pyproj.pj_list pyproj-module.html#pj_list
-pyproj.test pyproj-module.html#test
+pyproj._dict2string pyproj-module.html#_dict2string
+pyproj._copytobuffer_return_scalar pyproj-module.html#_copytobuffer_return_scalar
+pyproj.string_types pyproj-module.html#string_types
+pyproj.pyproj_datadir pyproj-module.html#pyproj_datadir
pyproj.Geod pyproj.Geod-class.html
pyproj.Geod.__new__ pyproj.Geod-class.html#__new__
pyproj.Geod.fwd pyproj.Geod-class.html#fwd
diff --git a/docs/class-tree.html b/docs/class-tree.html
index 0ac95ad..8f9cba8 100644
--- a/docs/class-tree.html
+++ b/docs/class-tree.html
@@ -98,7 +98,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
<tr>
<td align="left" class="footer">
- Generated by Epydoc 3.0.1 on Mon Dec 29 15:13:06 2014
+ Generated by Epydoc 3.0.1 on Wed Jan 6 15:26:35 2016
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/help.html b/docs/help.html
index fcc2fbf..5e5ca50 100644
--- a/docs/help.html
+++ b/docs/help.html
@@ -240,7 +240,7 @@ page was last updated. </p>
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
<tr>
<td align="left" class="footer">
- Generated by Epydoc 3.0.1 on Mon Dec 29 15:13:06 2014
+ Generated by Epydoc 3.0.1 on Wed Jan 6 15:26:35 2016
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/identifier-index.html b/docs/identifier-index.html
index e20d6de..4ec7a01 100644
--- a/docs/identifier-index.html
+++ b/docs/identifier-index.html
@@ -66,7 +66,7 @@
<a href="#P">P</a>
Q
R
- S
+ <a href="#S">S</a>
<a href="#T">T</a>
U
V
@@ -147,6 +147,18 @@
</tr>
</table>
</td></tr>
+<tr valign="top"><td valign="top" width="1%"><h2 class="epydoc"><a name="S">S</a></h2></td>
+<td valign="top">
+<table class="link-index" width="100%" border="1">
+<tr>
+<td width="33%" class="link-index"><a href="pyproj-module.html#string_types">string_types</a><br />
+<span class="index-where">(in <a href="pyproj-module.html">pyproj</a>)</span></td>
+<td width="33%" class="link-index"> </td>
+<td width="33%" class="link-index"> </td>
+</tr>
+<tr><td class="link-index"> </td><td class="link-index"> </td><td class="link-index"> </td></tr>
+</table>
+</td></tr>
<tr valign="top"><td valign="top" width="1%"><h2 class="epydoc"><a name="T">T</a></h2></td>
<td valign="top">
<table class="link-index" width="100%" border="1">
@@ -167,15 +179,16 @@
<tr>
<td width="33%" class="link-index"><a href="pyproj.Proj-class.html#__call__">__call__()</a><br />
<span class="index-where">(in <a href="pyproj.Proj-class.html">Proj</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyproj.Proj-class.html#__new__">__new__()</a><br />
-<span class="index-where">(in <a href="pyproj.Proj-class.html">Proj</a>)</span></td>
-<td width="33%" class="link-index"> </td>
-</tr>
-<tr>
<td width="33%" class="link-index"><a href="pyproj.Geod-class.html#__new__">__new__()</a><br />
<span class="index-where">(in <a href="pyproj.Geod-class.html">Geod</a>)</span></td>
<td width="33%" class="link-index"><a href="pyproj-module.html#__package__">__package__</a><br />
<span class="index-where">(in <a href="pyproj-module.html">pyproj</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="pyproj-module.html#__loader__">__loader__</a><br />
+<span class="index-where">(in <a href="pyproj-module.html">pyproj</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyproj.Proj-class.html#__new__">__new__()</a><br />
+<span class="index-where">(in <a href="pyproj.Proj-class.html">Proj</a>)</span></td>
<td width="33%" class="link-index"> </td>
</tr>
</table>
@@ -207,7 +220,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
<tr>
<td align="left" class="footer">
- Generated by Epydoc 3.0.1 on Mon Dec 29 15:13:06 2014
+ Generated by Epydoc 3.0.1 on Wed Jan 6 15:26:35 2016
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/index.html b/docs/index.html
index 6ec9135..b9992df 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -48,7 +48,7 @@
</tr>
</table>
<!-- ==================== PACKAGE DESCRIPTION ==================== -->
-<h1 class="epydoc">Package pyproj</h1><p class="nomargin-top"><span class="codelink"><a href="pyproj-pysrc.html">source code</a></span></p>
+<h1 class="epydoc">Package pyproj</h1><p class="nomargin-top"></p>
<p>Cython wrapper to provide python interfaces to PROJ.4
(http://trac.osgeo.org/proj/) functions.</p>
<p>Performs cartographic transformations and geodetic computations.</p>
@@ -87,7 +87,7 @@
<hr />
<div class="fields"> <p><strong>Version:</strong>
- 1.9.4
+ 1.9.5.1
</p>
</div><!-- ==================== CLASSES ==================== -->
<a name="section-Classes"></a>
@@ -134,7 +134,7 @@
<td><span class="summary-sig"><a name="test"></a><span class="summary-sig-name">test</span>()</span><br />
run the examples in the docstrings using the doctest module</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#test">source code</a></span>
+
</td>
</tr>
@@ -156,7 +156,7 @@
<span class="summary-sig-arg">radians</span>=<span class="summary-sig-default">False</span>)</span><br />
x2, y2, z2 = transform(p1, p2, x1, y1, z1, radians=False)</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#transform">source code</a></span>
+
</td>
</tr>
@@ -177,6 +177,14 @@
<td width="15%" align="right" valign="top" class="summary">
<span class="summary-type"> </span>
</td><td class="summary">
+ <a href="pyproj-module.html#__loader__" class="summary-name">__loader__</a> = <code title="<zipimporter object "/Users/jwhitaker/Library/Python/2.7/lib/python/si\
+te-packages/pyproj-1.9.5.1-py2.7-macosx-10.10-x86_64.egg">"><zipimporter object "/Users/jwhitaker/Library/Pyt<code class="variable-ellipsis">...</code></code>
+ </td>
+ </tr>
+<tr>
+ <td width="15%" align="right" valign="top" class="summary">
+ <span class="summary-type"> </span>
+ </td><td class="summary">
<a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'pyproj'"><code class="variable-quote">'</code><code class="variable-string">pyproj</code><code class="variable-quote">'</code></code>
</td>
</tr>
@@ -214,8 +222,14 @@
<td width="15%" align="right" valign="top" class="summary">
<span class="summary-type"> </span>
</td><td class="summary">
- <a href="pyproj-module.html#pyproj_datadir" class="summary-name">pyproj_datadir</a> = <code title="'/Users/jwhitaker/Library/Python/2.7/lib/python/site-packages/pyproj/d\
-ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/jwhitaker/Library/Python/2.7/lib/pyth</code><code class="variable-ellipsis">...</code></code>
+ <a name="pyproj_datadir"></a><span class="summary-name">pyproj_datadir</span> = <code title="'/opt/local/share/proj'"><code class="variable-quote">'</code><code class="variable-string">/opt/local/share/proj</code><code class="variable-quote">'</code></code>
+ </td>
+ </tr>
+<tr>
+ <td width="15%" align="right" valign="top" class="summary">
+ <span class="summary-type"> </span>
+ </td><td class="summary">
+ <a name="string_types"></a><span class="summary-name">string_types</span> = <code title="(<type 'basestring'>)"><code class="variable-group">(</code><type 'basestring'><code class="variable-group">)</code></code>
</td>
</tr>
</table>
@@ -243,7 +257,7 @@ ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/
<span class="sig-arg">radians</span>=<span class="sig-default">False</span>)</span>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#transform">source code</a></span>
+ >
</td>
</tr></table>
@@ -306,8 +320,8 @@ ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/
<span class="py-prompt">>>> </span>x1 = -111.5; y1 = 45.25919444444
<span class="py-prompt">>>> </span>p2 = Proj(proj=<span class="py-string">"utm"</span>,zone=10,datum=<span class="py-string">'NAD27'</span>)
<span class="py-prompt">>>> </span>x2, y2 = transform(p1, p2, x1, y1)
-<span class="py-prompt">>>> </span><span class="py-string">"%12.3f %12.3f"</span> % (x2,y2)
-<span class="py-output">' 1402285.991 5076292.423'</span></pre>
+<span class="py-prompt">>>> </span><span class="py-string">"%s %s"</span> % (str(x2)[:9],str(y2)[:9])
+<span class="py-output">'1402285.9 5076292.4'</span></pre>
<dl class="fields">
</dl>
</td></tr></table>
@@ -322,6 +336,25 @@ ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/
<span class="table-header">Variables Details</span></td>
</tr>
</table>
+<a name="__loader__"></a>
+<div>
+<table class="details" border="1" cellpadding="3"
+ cellspacing="0" width="100%" bgcolor="white">
+<tr><td>
+ <h3 class="epydoc">__loader__</h3>
+
+ <dl class="fields">
+ </dl>
+ <dl class="fields">
+ <dt>Value:</dt>
+ <dd><table><tr><td><pre class="variable">
+<zipimporter object "/Users/jwhitaker/Library/Python/2.7/lib/python/si<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+te-packages/pyproj-1.9.5.1-py2.7-macosx-10.10-x86_64.egg">
+</pre></td></tr></table>
+</dd>
+ </dl>
+</td></tr></table>
+</div>
<a name="pj_ellps"></a>
<div>
<table class="details" border="1" cellpadding="3"
@@ -374,25 +407,6 @@ ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/
</dl>
</td></tr></table>
</div>
-<a name="pyproj_datadir"></a>
-<div>
-<table class="details" border="1" cellpadding="3"
- cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
- <h3 class="epydoc">pyproj_datadir</h3>
-
- <dl class="fields">
- </dl>
- <dl class="fields">
- <dt>Value:</dt>
- <dd><table><tr><td><pre class="variable">
-<code class="variable-quote">'</code><code class="variable-string">/Users/jwhitaker/Library/Python/2.7/lib/python/site-packages/pyproj/d</code><span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
-<code class="variable-string">ata</code><code class="variable-quote">'</code>
-</pre></td></tr></table>
-</dd>
- </dl>
-</td></tr></table>
-</div>
<br />
<!-- ==================== NAVIGATION BAR ==================== -->
<table class="navbar" border="0" width="100%" cellpadding="0"
@@ -420,7 +434,7 @@ ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
<tr>
<td align="left" class="footer">
- Generated by Epydoc 3.0.1 on Mon Dec 29 15:13:06 2014
+ Generated by Epydoc 3.0.1 on Wed Jan 6 15:26:35 2016
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/module-tree.html b/docs/module-tree.html
index cf36b4e..790c872 100644
--- a/docs/module-tree.html
+++ b/docs/module-tree.html
@@ -78,7 +78,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
<tr>
<td align="left" class="footer">
- Generated by Epydoc 3.0.1 on Mon Dec 29 15:13:06 2014
+ Generated by Epydoc 3.0.1 on Wed Jan 6 15:26:35 2016
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/pyproj-module.html b/docs/pyproj-module.html
index 6ec9135..b9992df 100644
--- a/docs/pyproj-module.html
+++ b/docs/pyproj-module.html
@@ -48,7 +48,7 @@
</tr>
</table>
<!-- ==================== PACKAGE DESCRIPTION ==================== -->
-<h1 class="epydoc">Package pyproj</h1><p class="nomargin-top"><span class="codelink"><a href="pyproj-pysrc.html">source code</a></span></p>
+<h1 class="epydoc">Package pyproj</h1><p class="nomargin-top"></p>
<p>Cython wrapper to provide python interfaces to PROJ.4
(http://trac.osgeo.org/proj/) functions.</p>
<p>Performs cartographic transformations and geodetic computations.</p>
@@ -87,7 +87,7 @@
<hr />
<div class="fields"> <p><strong>Version:</strong>
- 1.9.4
+ 1.9.5.1
</p>
</div><!-- ==================== CLASSES ==================== -->
<a name="section-Classes"></a>
@@ -134,7 +134,7 @@
<td><span class="summary-sig"><a name="test"></a><span class="summary-sig-name">test</span>()</span><br />
run the examples in the docstrings using the doctest module</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#test">source code</a></span>
+
</td>
</tr>
@@ -156,7 +156,7 @@
<span class="summary-sig-arg">radians</span>=<span class="summary-sig-default">False</span>)</span><br />
x2, y2, z2 = transform(p1, p2, x1, y1, z1, radians=False)</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#transform">source code</a></span>
+
</td>
</tr>
@@ -177,6 +177,14 @@
<td width="15%" align="right" valign="top" class="summary">
<span class="summary-type"> </span>
</td><td class="summary">
+ <a href="pyproj-module.html#__loader__" class="summary-name">__loader__</a> = <code title="<zipimporter object "/Users/jwhitaker/Library/Python/2.7/lib/python/si\
+te-packages/pyproj-1.9.5.1-py2.7-macosx-10.10-x86_64.egg">"><zipimporter object "/Users/jwhitaker/Library/Pyt<code class="variable-ellipsis">...</code></code>
+ </td>
+ </tr>
+<tr>
+ <td width="15%" align="right" valign="top" class="summary">
+ <span class="summary-type"> </span>
+ </td><td class="summary">
<a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'pyproj'"><code class="variable-quote">'</code><code class="variable-string">pyproj</code><code class="variable-quote">'</code></code>
</td>
</tr>
@@ -214,8 +222,14 @@
<td width="15%" align="right" valign="top" class="summary">
<span class="summary-type"> </span>
</td><td class="summary">
- <a href="pyproj-module.html#pyproj_datadir" class="summary-name">pyproj_datadir</a> = <code title="'/Users/jwhitaker/Library/Python/2.7/lib/python/site-packages/pyproj/d\
-ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/jwhitaker/Library/Python/2.7/lib/pyth</code><code class="variable-ellipsis">...</code></code>
+ <a name="pyproj_datadir"></a><span class="summary-name">pyproj_datadir</span> = <code title="'/opt/local/share/proj'"><code class="variable-quote">'</code><code class="variable-string">/opt/local/share/proj</code><code class="variable-quote">'</code></code>
+ </td>
+ </tr>
+<tr>
+ <td width="15%" align="right" valign="top" class="summary">
+ <span class="summary-type"> </span>
+ </td><td class="summary">
+ <a name="string_types"></a><span class="summary-name">string_types</span> = <code title="(<type 'basestring'>)"><code class="variable-group">(</code><type 'basestring'><code class="variable-group">)</code></code>
</td>
</tr>
</table>
@@ -243,7 +257,7 @@ ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/
<span class="sig-arg">radians</span>=<span class="sig-default">False</span>)</span>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#transform">source code</a></span>
+ >
</td>
</tr></table>
@@ -306,8 +320,8 @@ ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/
<span class="py-prompt">>>> </span>x1 = -111.5; y1 = 45.25919444444
<span class="py-prompt">>>> </span>p2 = Proj(proj=<span class="py-string">"utm"</span>,zone=10,datum=<span class="py-string">'NAD27'</span>)
<span class="py-prompt">>>> </span>x2, y2 = transform(p1, p2, x1, y1)
-<span class="py-prompt">>>> </span><span class="py-string">"%12.3f %12.3f"</span> % (x2,y2)
-<span class="py-output">' 1402285.991 5076292.423'</span></pre>
+<span class="py-prompt">>>> </span><span class="py-string">"%s %s"</span> % (str(x2)[:9],str(y2)[:9])
+<span class="py-output">'1402285.9 5076292.4'</span></pre>
<dl class="fields">
</dl>
</td></tr></table>
@@ -322,6 +336,25 @@ ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/
<span class="table-header">Variables Details</span></td>
</tr>
</table>
+<a name="__loader__"></a>
+<div>
+<table class="details" border="1" cellpadding="3"
+ cellspacing="0" width="100%" bgcolor="white">
+<tr><td>
+ <h3 class="epydoc">__loader__</h3>
+
+ <dl class="fields">
+ </dl>
+ <dl class="fields">
+ <dt>Value:</dt>
+ <dd><table><tr><td><pre class="variable">
+<zipimporter object "/Users/jwhitaker/Library/Python/2.7/lib/python/si<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+te-packages/pyproj-1.9.5.1-py2.7-macosx-10.10-x86_64.egg">
+</pre></td></tr></table>
+</dd>
+ </dl>
+</td></tr></table>
+</div>
<a name="pj_ellps"></a>
<div>
<table class="details" border="1" cellpadding="3"
@@ -374,25 +407,6 @@ ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/
</dl>
</td></tr></table>
</div>
-<a name="pyproj_datadir"></a>
-<div>
-<table class="details" border="1" cellpadding="3"
- cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
- <h3 class="epydoc">pyproj_datadir</h3>
-
- <dl class="fields">
- </dl>
- <dl class="fields">
- <dt>Value:</dt>
- <dd><table><tr><td><pre class="variable">
-<code class="variable-quote">'</code><code class="variable-string">/Users/jwhitaker/Library/Python/2.7/lib/python/site-packages/pyproj/d</code><span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
-<code class="variable-string">ata</code><code class="variable-quote">'</code>
-</pre></td></tr></table>
-</dd>
- </dl>
-</td></tr></table>
-</div>
<br />
<!-- ==================== NAVIGATION BAR ==================== -->
<table class="navbar" border="0" width="100%" cellpadding="0"
@@ -420,7 +434,7 @@ ata'"><code class="variable-quote">'</code><code class="variable-string">/Users/
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
<tr>
<td align="left" class="footer">
- Generated by Epydoc 3.0.1 on Mon Dec 29 15:13:06 2014
+ Generated by Epydoc 3.0.1 on Wed Jan 6 15:26:35 2016
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/pyproj.Geod-class.html b/docs/pyproj.Geod-class.html
index 790adc5..7ff80da 100644
--- a/docs/pyproj.Geod-class.html
+++ b/docs/pyproj.Geod-class.html
@@ -49,7 +49,7 @@
</tr>
</table>
<!-- ==================== CLASS DESCRIPTION ==================== -->
-<h1 class="epydoc">Class Geod</h1><p class="nomargin-top"><span class="codelink"><a href="pyproj-pysrc.html#Geod">source code</a></span></p>
+<h1 class="epydoc">Class Geod</h1><p class="nomargin-top"></p>
<pre class="base-tree">
object --+
|
@@ -94,7 +94,7 @@ object --+
(lats) of initial points, plus forward azimuths (az) and distances
(dist).</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#Geod.fwd">source code</a></span>
+
</td>
</tr>
@@ -118,7 +118,7 @@ object --+
distances between initial points (specified by lons1, lats1) and
terminus points (specified by lons2, lats2).</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#Geod.inv">source code</a></span>
+
</td>
</tr>
@@ -144,7 +144,7 @@ object --+
pairs describing npts equally spaced intermediate points along the
geodesic between the initial and terminus points.</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#Geod.npts">source code</a></span>
+
</td>
</tr>
@@ -192,7 +192,7 @@ object --+
<span class="summary-sig-arg">**kwargs</span>)</span><br />
initialize a Geod class instance.</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#Geod.__new__">source code</a></span>
+
</td>
</tr>
@@ -242,7 +242,7 @@ object --+
<br /><em class="fname">Static Method</em>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#Geod.__new__">source code</a></span>
+ >
</td>
</tr></table>
@@ -366,7 +366,7 @@ object --+
<span class="sig-arg">radians</span>=<span class="sig-default">False</span>)</span>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#Geod.fwd">source code</a></span>
+ >
</td>
</tr></table>
@@ -398,7 +398,7 @@ object --+
<span class="sig-arg">radians</span>=<span class="sig-default">False</span>)</span>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#Geod.inv">source code</a></span>
+ >
</td>
</tr></table>
@@ -429,7 +429,7 @@ object --+
<span class="sig-arg">radians</span>=<span class="sig-default">False</span>)</span>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#Geod.npts">source code</a></span>
+ >
</td>
</tr></table>
@@ -507,7 +507,7 @@ object --+
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
<tr>
<td align="left" class="footer">
- Generated by Epydoc 3.0.1 on Mon Dec 29 15:13:06 2014
+ Generated by Epydoc 3.0.1 on Wed Jan 6 15:26:35 2016
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/pyproj.Proj-class.html b/docs/pyproj.Proj-class.html
index 5c7e33b..700cc37 100644
--- a/docs/pyproj.Proj-class.html
+++ b/docs/pyproj.Proj-class.html
@@ -49,7 +49,7 @@
</tr>
</table>
<!-- ==================== CLASS DESCRIPTION ==================== -->
-<h1 class="epydoc">Class Proj</h1><p class="nomargin-top"><span class="codelink"><a href="pyproj-pysrc.html#Proj">source code</a></span></p>
+<h1 class="epydoc">Class Proj</h1><p class="nomargin-top"></p>
<pre class="base-tree">
object --+
|
@@ -103,7 +103,7 @@ object --+
convert lon/lat (in degrees) to x/y native map projection coordinates
(in meters).</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#Proj.__call__">source code</a></span>
+
</td>
</tr>
@@ -120,7 +120,7 @@ object --+
<td><span class="summary-sig"><a href="pyproj.Proj-class.html#is_geocent" class="summary-sig-name">is_geocent</a>(<span class="summary-sig-arg">self</span>)</span><br />
returns True if projection in geocentric (x/y) coordinates</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#Proj.is_geocent">source code</a></span>
+
</td>
</tr>
@@ -137,7 +137,7 @@ object --+
<td><span class="summary-sig"><a href="pyproj.Proj-class.html#is_latlong" class="summary-sig-name">is_latlong</a>(<span class="summary-sig-arg">self</span>)</span><br />
returns True if projection in geographic (lon/lat) coordinates</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#Proj.is_latlong">source code</a></span>
+
</td>
</tr>
@@ -154,7 +154,7 @@ object --+
<td><span class="summary-sig"><a href="pyproj.Proj-class.html#to_latlong" class="summary-sig-name">to_latlong</a>(<span class="summary-sig-arg">self</span>)</span><br />
returns an equivalent Proj in the corresponding lon/lat coordinates.</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#Proj.to_latlong">source code</a></span>
+
</td>
</tr>
@@ -203,7 +203,7 @@ object --+
<span class="summary-sig-arg">**kwargs</span>)</span><br />
initialize a Proj class instance.</td>
<td align="right" valign="top">
- <span class="codelink"><a href="pyproj-pysrc.html#Proj.__new__">source code</a></span>
+
</td>
</tr>
@@ -254,7 +254,7 @@ object --+
<br /><em class="fname">(Call operator)</em>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#Proj.__call__">source code</a></span>
+ >
</td>
</tr></table>
@@ -267,9 +267,6 @@ object --+
(default is False) an exception is raised if the transformation is
invalid. If errcheck=False and the transformation is invalid, no
exception is raised and 1.e30 is returned.</p>
- <p>Instead of calling with lon, lat, a single ndarray of shape n,2 may be
- used, and one of the same shape will be returned; this is more
- efficient.</p>
<p>Inputs should be doubles (they will be cast to doubles if they are
not, causing a slight performance hit).</p>
<p>Works with numpy and regular python array objects, python sequences
@@ -292,7 +289,7 @@ object --+
<br /><em class="fname">Static Method</em>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#Proj.__new__">source code</a></span>
+ >
</td>
</tr></table>
@@ -332,7 +329,14 @@ object --+
<span class="py-output">'x=-1783486.760 y= 6193833.196 (meters)'</span>
<span class="py-output"></span><span class="py-prompt">>>> </span>p = Proj(<span class="py-string">"+init=epsg:32667"</span>,preserve_units=True)
<span class="py-prompt">>>> </span><span class="py-string">'x=%12.3f y=%12.3f (feet)'</span> % p(-114.057222, 51.045)
-<span class="py-output">'x=-5851322.810 y=20320934.409 (feet)'</span></pre>
+<span class="py-output">'x=-5851322.810 y=20320934.409 (feet)'</span>
+<span class="py-output"></span><span class="py-prompt">>>> </span>p = Proj(proj=<span class="py-string">'hammer'</span>) <span class="py-comment"># hammer proj and inverse</span>
+<span class="py-prompt">>>> </span>x,y = p(-30,40)
+<span class="py-prompt">>>> </span><span class="py-string">'x=%12.3f y=%12.3f'</span> % (x,y)
+<span class="py-output">'x=-2711575.083 y= 4395506.619'</span>
+<span class="py-output"></span><span class="py-prompt">>>> </span>lon,lat = p(x,y,inverse=True)
+<span class="py-prompt">>>> </span><span class="py-string">'lon=%9.3f lat=%9.3f (degrees)'</span> % (lon,lat)
+<span class="py-output">'lon= -30.000 lat= 40.000 (degrees)'</span></pre>
<dl class="fields">
<dt>Returns: a new object with type S, a subtype of T</dt>
<dt>Overrides:
@@ -351,7 +355,7 @@ object --+
<h3 class="epydoc"><span class="sig"><span class="sig-name">is_geocent</span>(<span class="sig-arg">self</span>)</span>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#Proj.is_geocent">source code</a></span>
+ >
</td>
</tr></table>
@@ -373,7 +377,7 @@ object --+
<h3 class="epydoc"><span class="sig"><span class="sig-name">is_latlong</span>(<span class="sig-arg">self</span>)</span>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#Proj.is_latlong">source code</a></span>
+ >
</td>
</tr></table>
@@ -395,7 +399,7 @@ object --+
<h3 class="epydoc"><span class="sig"><span class="sig-name">to_latlong</span>(<span class="sig-arg">self</span>)</span>
</h3>
</td><td align="right" valign="top"
- ><span class="codelink"><a href="pyproj-pysrc.html#Proj.to_latlong">source code</a></span>
+ >
</td>
</tr></table>
@@ -435,7 +439,7 @@ object --+
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
<tr>
<td align="left" class="footer">
- Generated by Epydoc 3.0.1 on Mon Dec 29 15:13:06 2014
+ Generated by Epydoc 3.0.1 on Wed Jan 6 15:26:35 2016
</td>
<td align="right" class="footer">
<a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/setup.py b/setup.py
index f1c8118..e025ccc 100644
--- a/setup.py
+++ b/setup.py
@@ -90,7 +90,7 @@ packages = ['pyproj']
package_dirs = {'':'lib'}
setup(name = "pyproj",
- version = "1.9.5",
+ version = "1.9.5.1",
description = "Python interface to PROJ.4 library",
long_description = """
Performs cartographic transformations between geographic (lat/lon)
diff --git a/src/pj_strtod.c b/src/pj_strtod.c
index 9aac07e..7c2da9a 100644
--- a/src/pj_strtod.c
+++ b/src/pj_strtod.c
@@ -76,7 +76,13 @@ static char* pj_replace_point_by_locale_point(const char* pszNumber, char point,
char* pszWorkBuffer)
{
#if !defined(HAVE_LOCALECONV) || defined(_WIN32_WCE)
+
+#if defined(_MSC_VER) /* Visual C++ */
+#pragma message("localeconv not available")
+#else
#warning "localeconv not available"
+#endif
+
static char byPoint = 0;
if (byPoint == 0)
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-pyproj.git
More information about the Pkg-grass-devel
mailing list