Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.1.X] Fixed #12101 -- `OGRGeometry` does not need to create a clone…

… of the `SpatialReference` object upon assignment.

Backport of r11707 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a9c816c41b091888a99918ee4c4038eccd577d84 1 parent e3f07d2
@jbronn jbronn authored
Showing with 6 additions and 2 deletions.
  1. +6 −2 django/contrib/gis/gdal/geometries.py
View
8 django/contrib/gis/gdal/geometries.py
@@ -256,11 +256,15 @@ def _get_srs(self):
def _set_srs(self, srs):
"Sets the SpatialReference for this geometry."
+ # Do not have to clone the `SpatialReference` object pointer because
+ # when it is assigned to this `OGRGeometry` it's internal OGR
+ # reference count is incremented, and will likewise be released
+ # (decremented) when this geometry's destructor is called.
if isinstance(srs, SpatialReference):
- srs_ptr = srs_api.clone_srs(srs.ptr)
+ srs_ptr = srs.ptr
elif isinstance(srs, (int, long, basestring)):
sr = SpatialReference(srs)
- srs_ptr = srs_api.clone_srs(sr.ptr)
+ srs_ptr = sr.ptr
else:
raise TypeError('Cannot assign spatial reference with object of type: %s' % type(srs))
capi.assign_srs(self.ptr, srs_ptr)
Please sign in to comment.
Something went wrong with that request. Please try again.