Commit d3adb9f0 authored by Dan Baston's avatar Dan Baston Committed by Gitea

Merge branch 'trac-874-backport' of dbaston/geos into svn-3.6

parents b0690d0c 679c0058
Pipeline #22964938 failed
...@@ -4,6 +4,7 @@ YYYY-MM-DD ...@@ -4,6 +4,7 @@ YYYY-MM-DD
- Bug fixes / improvements - Bug fixes / improvements
- Include all CMake files in release (#753) - Include all CMake files in release (#753)
- Remove BOM from source files, restoring support for GCC-4.9 (#846) - Remove BOM from source files, restoring support for GCC-4.9 (#846)
- Fix memory leak in GEOSSTRtree_nearest_r (#874, Dan Baston)
Changes in 3.6.2 Changes in 3.6.2
2017-07-25 2017-07-25
......
...@@ -6071,7 +6071,7 @@ GEOSSTRtree_nearest_r(GEOSContextHandle_t extHandle, ...@@ -6071,7 +6071,7 @@ GEOSSTRtree_nearest_r(GEOSContextHandle_t extHandle,
geos::index::strtree::STRtree *tree, geos::index::strtree::STRtree *tree,
const geos::geom::Geometry* geom) const geos::geom::Geometry* geom)
{ {
return (const GEOSGeometry*) GEOSSTRtree_nearest_generic_r( extHandle, tree, geom, geom->getEnvelope(), NULL, NULL); return (const GEOSGeometry*) GEOSSTRtree_nearest_generic_r( extHandle, tree, geom, geom, NULL, NULL);
} }
const void * const void *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment