[python-shapely] 02/05: Imported Upstream version 1.5.15

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository python-shapely.

commit c7928f013da0ecc783e915d29f03331189683eb7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Mar 30 20:01:29 2016 +0200

    Imported Upstream version 1.5.15
---
 CHANGES.txt         | 8 ++++++--
 shapely/__init__.py | 2 +-
 shapely/_geos.pxi   | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 274267f..ecc2cb9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,12 @@
 Changes
 =======
 
+1.5.15 (2016-03-29)
+-------------------
+- Bug fix: use uintptr_t to store pointers instead of long in _geos.pxi,
+  preventing an overflow error (#372, #373). Note that this bug fix was
+  erroneously reported to have been made in 1.5.14, but was not.
+
 1.5.14 (2016-03-27)
 -------------------
 - Bug fix: use ``type()`` instead of ``isinstance()`` when evaluating geometry
@@ -11,8 +17,6 @@ Changes
 - Bug fix: support app "freezing" better on Windows by not relying on the
   ``__file__`` attribute (#342, #377).
 - Bug fix: ensure that empty polygons evaluate to be ``==`` (#355).
-- Bug fix: use uintptr_t to store pointers instead of long in _geos.pxi,
-  preventing an overflow error (#372, #373).
 - Bug fix: filter out empty geometries that can cause segfaults when creating
   and loading STRtrees (#345, #348).
 - Bug fix: no longer attempt to reuse GEOS DLLs already loaded by Rasterio
diff --git a/shapely/__init__.py b/shapely/__init__.py
index 0240f96..3723cfa 100644
--- a/shapely/__init__.py
+++ b/shapely/__init__.py
@@ -1 +1 @@
-__version__ = "1.5.14"
+__version__ = "1.5.15"
diff --git a/shapely/_geos.pxi b/shapely/_geos.pxi
index d7b0fa5..7cf7777 100644
--- a/shapely/_geos.pxi
+++ b/shapely/_geos.pxi
@@ -1,7 +1,7 @@
 # The beginnings of a Cython definition of GEOS. In the future much of this
 # could be auto-generated.
 
-ctypedef long ptr
+from libc.stdint cimport uintptr_t
 
 
 cdef extern from "geos_c.h":
@@ -9,7 +9,7 @@ cdef extern from "geos_c.h":
     ctypedef struct GEOSGeometry
     ctypedef struct GEOSCoordSequence
     ctypedef struct GEOSPreparedGeometry
-    
+
     GEOSCoordSequence *GEOSCoordSeq_create_r(GEOSContextHandle_t, unsigned int, unsigned int) nogil
     GEOSCoordSequence *GEOSGeom_getCoordSeq_r(GEOSContextHandle_t, GEOSGeometry *) nogil
 
@@ -48,11 +48,11 @@ cdef extern from "geos_c.h":
 cdef GEOSContextHandle_t get_geos_context_handle():
     # Note: This requires that lgeos is defined, so needs to be imported as:
     from shapely.geos import lgeos
-    cdef ptr handle = lgeos.geos_handle
+    cdef uintptr_t handle = lgeos.geos_handle
     return <GEOSContextHandle_t>handle
 
 
 cdef GEOSPreparedGeometry *geos_from_prepared(shapely_geom) except *:
     """Get the Prepared GEOS geometry pointer from the given shapely geometry."""
-    cdef ptr geos_geom = shapely_geom._geom
+    cdef uintptr_t geos_geom = shapely_geom._geom
     return <GEOSPreparedGeometry *>geos_geom

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git