Commit f1fe7c00 authored by Justin Bronn's avatar Justin Bronn
Browse files

[1.1.X] Fixed #11609 -- The `check_pointer` error checking routine and... 

[1.1.X] Fixed #11609 -- The `check_pointer` error checking routine and `GDALBase._set_ptr` are now able to handle the long pointer addresses used by some x86_64 platforms. Thanks, rmkemker, for the bug report.

Backport of r12006 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 90f7dfb4

django/contrib/gis/gdal/base.py

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ class GDALBase(object): 
    def _set_ptr(self, ptr):

        # Only allow the pointer to be set with pointers of the

        # compatible type or None (NULL).

        if isinstance(ptr, int):

        if isinstance(ptr, (int, long)):

            self._ptr = self.ptr_type(ptr)

        elif isinstance(ptr, (self.ptr_type, NoneType)):

            self._ptr = ptr

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

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ def check_errcode(result, func, cargs): 


def check_pointer(result, func, cargs):

    "Makes sure the result pointer is valid."

    if isinstance(result, (int, long)):

        result = c_void_p(result)

    if bool(result): 

        return result

    else: