Skip to content
Permalink
Browse files

followup cc877c3: fix build

  • Loading branch information
m-kuhn committed Jun 11, 2017
1 parent cc877c3 commit 31162adf795af01c250838d7624353bc448daaa2
Showing with 7 additions and 7 deletions.
  1. +7 −7 src/core/qgsgeometryvalidator.cpp
@@ -218,7 +218,7 @@ void QgsGeometryValidator::run()
case QgsGeometry::ValidatorGeos:
{
char *r = nullptr;
GEOSGeometry *g0 = mG.exportToGeos();
GEOSGeometry *g0 = mGeometry.exportToGeos();
GEOSContextHandle_t handle = QgsGeometry::getGEOSHandler();
if ( !g0 )
{
@@ -264,26 +264,26 @@ void QgsGeometryValidator::run()
{
QgsDebugMsg( "validation thread started." );

QgsWkbTypes::Type flatType = QgsWkbTypes::flatType( mG.wkbType() );
QgsWkbTypes::Type flatType = QgsWkbTypes::flatType( mGeometry.wkbType() );
//if ( flatType == QgsWkbTypes::Point || flatType == QgsWkbTypes::MultiPoint )
// break;
if ( flatType == QgsWkbTypes::LineString )
{
validatePolyline( 0, mG.asPolyline() );
validatePolyline( 0, mGeometry.asPolyline() );
}
else if ( flatType == QgsWkbTypes::MultiLineString )
{
QgsMultiPolyline mp = mG.asMultiPolyline();
QgsMultiPolyline mp = mGeometry.asMultiPolyline();
for ( int i = 0; !mStop && i < mp.size(); i++ )
validatePolyline( i, mp[i] );
}
else if ( flatType == QgsWkbTypes::Polygon )
{
validatePolygon( 0, mG.asPolygon() );
validatePolygon( 0, mGeometry.asPolygon() );
}
else if ( flatType == QgsWkbTypes::MultiPolygon )
{
QgsMultiPolygon mp = mG.asMultiPolygon();
QgsMultiPolygon mp = mGeometry.asMultiPolygon();
for ( int i = 0; !mStop && i < mp.size(); i++ )
{
validatePolygon( i, mp[i] );
@@ -324,7 +324,7 @@ void QgsGeometryValidator::run()
else if ( flatType == QgsWkbTypes::Unknown )
{
QgsDebugMsg( QObject::tr( "Unknown geometry type" ) );
emit errorFound( QgsGeometry::Error( QObject::tr( "Unknown geometry type %1" ).arg( mG.wkbType() ) ) );
emit errorFound( QgsGeometry::Error( QObject::tr( "Unknown geometry type %1" ).arg( mGeometry.wkbType() ) ) );
mErrorCount++;
}

0 comments on commit 31162ad

Please sign in to comment.
You can’t perform that action at this time.