mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-05 00:09:32 -04:00
fixup! sfcgal: add buffer like operations
This commit is contained in:
parent
cb61367ccd
commit
65ba76b0e7
@ -360,21 +360,21 @@ bool QgsSfcgalGeometry::intersects( const QgsSfcgalGeometry &otherGeom, QString
|
||||
return out;
|
||||
}
|
||||
|
||||
QgsSfcgalGeometry *QgsSfcgalGeometry::intersection( const QgsAbstractGeometry *otherGeom, QString *errorMsg, const QgsGeometryParameters ¶meters ) const
|
||||
QgsSfcgalGeometry *QgsSfcgalGeometry::intersection( const QgsAbstractGeometry *otherGeom, QString *errorMsg, const QgsGeometryParameters & ) const
|
||||
{
|
||||
sfcgal::errorHandler()->clearText( errorMsg );
|
||||
sfcgal::shared_geom otherShared = QgsSfcgalEngine::fromAbstractGeometry( otherGeom, errorMsg );
|
||||
CHECK_SUCCESS( errorMsg, nullptr );
|
||||
|
||||
sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherShared.get(), errorMsg, parameters );
|
||||
sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherShared.get(), errorMsg );
|
||||
CHECK_SUCCESS( errorMsg, nullptr );
|
||||
return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release();
|
||||
}
|
||||
|
||||
QgsSfcgalGeometry *QgsSfcgalGeometry::intersection( const QgsSfcgalGeometry &otherGeom, QString *errorMsg, const QgsGeometryParameters ¶meters ) const
|
||||
QgsSfcgalGeometry *QgsSfcgalGeometry::intersection( const QgsSfcgalGeometry &otherGeom, QString *errorMsg, const QgsGeometryParameters & ) const
|
||||
{
|
||||
sfcgal::errorHandler()->clearText( errorMsg );
|
||||
sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), errorMsg, parameters );
|
||||
sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), errorMsg );
|
||||
CHECK_SUCCESS( errorMsg, nullptr );
|
||||
return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release();
|
||||
}
|
||||
@ -397,22 +397,22 @@ QgsSfcgalGeometry *QgsSfcgalGeometry::combine( const QVector<const QgsAbstractGe
|
||||
;
|
||||
}
|
||||
|
||||
QgsSfcgalGeometry *QgsSfcgalGeometry::difference( const QgsAbstractGeometry *otherGeom, QString *errorMsg, const QgsGeometryParameters ¶meters ) const
|
||||
QgsSfcgalGeometry *QgsSfcgalGeometry::difference( const QgsAbstractGeometry *otherGeom, QString *errorMsg, const QgsGeometryParameters & ) const
|
||||
{
|
||||
sfcgal::errorHandler()->clearText( errorMsg );
|
||||
sfcgal::shared_geom otherSharedr = QgsSfcgalEngine::fromAbstractGeometry( otherGeom, errorMsg );
|
||||
CHECK_SUCCESS( errorMsg, nullptr );
|
||||
|
||||
sfcgal::shared_geom result = QgsSfcgalEngine::difference( mSfcgalGeom.get(), otherSharedr.get(), errorMsg, parameters );
|
||||
sfcgal::shared_geom result = QgsSfcgalEngine::difference( mSfcgalGeom.get(), otherSharedr.get(), errorMsg );
|
||||
CHECK_SUCCESS( errorMsg, nullptr );
|
||||
return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release();
|
||||
}
|
||||
|
||||
QgsSfcgalGeometry *QgsSfcgalGeometry::difference( const QgsSfcgalGeometry &otherGeom, QString *errorMsg, const QgsGeometryParameters ¶meters ) const
|
||||
QgsSfcgalGeometry *QgsSfcgalGeometry::difference( const QgsSfcgalGeometry &otherGeom, QString *errorMsg, const QgsGeometryParameters & ) const
|
||||
{
|
||||
sfcgal::errorHandler()->clearText( errorMsg );
|
||||
|
||||
sfcgal::shared_geom result = QgsSfcgalEngine::difference( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), errorMsg, parameters );
|
||||
sfcgal::shared_geom result = QgsSfcgalEngine::difference( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), errorMsg );
|
||||
CHECK_SUCCESS( errorMsg, nullptr );
|
||||
return QgsSfcgalEngine::toSfcgalGeometry( result, errorMsg ).release();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user