Skip to content

Commit

Permalink
Merge pull request #2905 from manisandro/checker_crash
Browse files Browse the repository at this point in the history
[Geometry checker] Make polyLineSize survive empty geometries
  • Loading branch information
manisandro committed Mar 14, 2016
2 parents d6fca7e + 34bd124 commit 13d407e
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions src/plugins/geometry_checker/utils/qgsgeomutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,22 @@ namespace QgsGeomUtils
*/
inline int polyLineSize( const QgsAbstractGeometryV2* geom, int iPart, int iRing, bool* isClosed = nullptr )
{
int nVerts = geom->vertexCount( iPart, iRing );
QgsPointV2 front = geom->vertexAt( QgsVertexId( iPart, iRing, 0 ) );
QgsPointV2 back = geom->vertexAt( QgsVertexId( iPart, iRing, nVerts - 1 ) );
bool closed = back == front;
if ( isClosed )
*isClosed = closed;
return closed ? nVerts - 1 : nVerts;
if ( !geom->isEmpty() )
{
int nVerts = geom->vertexCount( iPart, iRing );
QgsPointV2 front = geom->vertexAt( QgsVertexId( iPart, iRing, 0 ) );
QgsPointV2 back = geom->vertexAt( QgsVertexId( iPart, iRing, nVerts - 1 ) );
bool closed = back == front;
if ( isClosed )
*isClosed = closed;
return closed ? nVerts - 1 : nVerts;
}
else
{
if ( isClosed )
*isClosed = true;
return 0;
}
}

double sharedEdgeLength( const QgsAbstractGeometryV2* geom1, const QgsAbstractGeometryV2* geom2, double tol );
Expand Down

0 comments on commit 13d407e

Please sign in to comment.