sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-18 00:06:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

qgssfcgalgeometry: Add missing SIP_OUT parameter to combine

Browse Source
This commit is contained in:
Jean Felder 2025-08-05 15:10:28 +02:00 committed by Nyall Dawson
parent 1391badd27
commit d3c8c2d37f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/PyQt6/core/auto_generated/geometry/qgssfcgalgeometry.sip.in
View File

@ -417,14 +417,14 @@ Calculate the intersection of this and ``otherGeom``.
- errorMsg: Error message returned by SFGCAL - errorMsg: Error message returned by SFGCAL
%End %End
std::unique_ptr<QgsSfcgalGeometry> combine( const QVector<QgsAbstractGeometry *> &geomList, QString *errorMsg ) const; std::unique_ptr<QgsSfcgalGeometry> combine( const QVector<QgsAbstractGeometry *> &geomList, QString *errorMsg /Out/ = 0 ) const;
%Docstring %Docstring
Calculate the combination of this and ``geomList``. Calculate the combination of this and ``geomList``.
:param geomList: list of geometries to perform the operation :param geomList: list of geometries to perform the operation
:param errorMsg: Error message returned by SFGCAL
:return: new geometry :return: - new geometry
- errorMsg: Error message returned by SFGCAL
%End %End
std::unique_ptr<QgsSfcgalGeometry> difference( const QgsAbstractGeometry *otherGeom, QString *errorMsg /Out/ = 0, const QgsGeometryParameters &parameters = QgsGeometryParameters() ) const; std::unique_ptr<QgsSfcgalGeometry> difference( const QgsAbstractGeometry *otherGeom, QString *errorMsg /Out/ = 0, const QgsGeometryParameters &parameters = QgsGeometryParameters() ) const;

6
python/core/auto_generated/geometry/qgssfcgalgeometry.sip.in
View File

@ -417,14 +417,14 @@ Calculate the intersection of this and ``otherGeom``.
- errorMsg: Error message returned by SFGCAL - errorMsg: Error message returned by SFGCAL
%End %End
std::unique_ptr<QgsSfcgalGeometry> combine( const QVector<QgsAbstractGeometry *> &geomList, QString *errorMsg ) const; std::unique_ptr<QgsSfcgalGeometry> combine( const QVector<QgsAbstractGeometry *> &geomList, QString *errorMsg /Out/ = 0 ) const;
%Docstring %Docstring
Calculate the combination of this and ``geomList``. Calculate the combination of this and ``geomList``.
:param geomList: list of geometries to perform the operation :param geomList: list of geometries to perform the operation
:param errorMsg: Error message returned by SFGCAL
:return: new geometry :return: - new geometry
- errorMsg: Error message returned by SFGCAL
%End %End
std::unique_ptr<QgsSfcgalGeometry> difference( const QgsAbstractGeometry *otherGeom, QString *errorMsg /Out/ = 0, const QgsGeometryParameters &parameters = QgsGeometryParameters() ) const; std::unique_ptr<QgsSfcgalGeometry> difference( const QgsAbstractGeometry *otherGeom, QString *errorMsg /Out/ = 0, const QgsGeometryParameters &parameters = QgsGeometryParameters() ) const;

2
src/core/geometry/qgssfcgalgeometry.h
View File

@ -375,7 +375,7 @@ class CORE_EXPORT QgsSfcgalGeometry
* \param errorMsg Error message returned by SFGCAL * \param errorMsg Error message returned by SFGCAL
* \return new geometry * \return new geometry
*/ */
std::unique_ptr<QgsSfcgalGeometry> combine( const QVector<QgsAbstractGeometry *> &geomList, QString *errorMsg ) const; std::unique_ptr<QgsSfcgalGeometry> combine( const QVector<QgsAbstractGeometry *> &geomList, QString *errorMsg SIP_OUT = nullptr ) const;
/** /**
* Calculate the difference of this and \a otherGeom. * Calculate the difference of this and \a otherGeom.