Commit 90f7dfb4 authored by Justin Bronn's avatar Justin Bronn
Browse files

[1.1.X] Fixed #12450 -- `GEOSFree` was really added in GEOS 3.1.1, not 3.1.0. ... 

[1.1.X] Fixed #12450 -- `GEOSFree` was really added in GEOS 3.1.1, not 3.1.0.  Thanks, jpwatts for the bug report.

Backport or r12004 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3201e7b0

django/contrib/gis/geos/prototypes/errcheck.py

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ from django.contrib.gis.geos.libgeos import lgeos, GEOS_VERSION 


# Getting the `free` routine used to free the memory allocated for

# string pointers returned by GEOS.

if GEOS_VERSION >= (3, 1, 0):

    # In versions 3.1 and above, `GEOSFree` was added to the C API

if GEOS_VERSION >= (3, 1, 1):

    # In versions 3.1.1 and above, `GEOSFree` was added to the C API

    # because `free` isn't always available on all platforms.

    free = lgeos.GEOSFree

    free.argtypes = [c_void_p]