Avoid extra copy of point in QgsGeometry::centroid()

m-kuhn · m-kuhn · commit 3da4c33bb3ff · 2017-08-13T15:27:58.000+02:00
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -1585,16 +1585,16 @@ QgsGeometry QgsGeometry::centroid() const
   }
 
   QgsGeos geos( d->geometry );
-  QgsPoint centroid;
+  std::unique_ptr<QgsPoint> centroid( new QgsPoint() );
   QString error;
-  bool ok = geos.centroid( centroid, &error );
+  bool ok = geos.centroid( *centroid.get(), &error );
   if ( !ok )
   {
     QgsGeometry geom;
     geom.d->error = error;
     return geom;
   }
-  return QgsGeometry( centroid.clone() );
+  return QgsGeometry( centroid.release() );
 }
 
 QgsGeometry QgsGeometry::pointOnSurface() const

Original file line number	Diff line number	Diff line change
`@@ -1585,16 +1585,16 @@ QgsGeometry QgsGeometry::centroid() const`
`1585`	`1585`	`}`
`1586`	`1586`
`1587`	`1587`	`QgsGeos geos( d->geometry );`
`1588`		`- QgsPoint centroid;`
	`1588`	`+ std::unique_ptr<QgsPoint> centroid( new QgsPoint() );`
`1589`	`1589`	`QString error;`
`1590`		`- bool ok = geos.centroid( centroid, &error );`
	`1590`	`+ bool ok = geos.centroid( *centroid.get(), &error );`
`1591`	`1591`	`if ( !ok )`
`1592`	`1592`	`{`
`1593`	`1593`	`QgsGeometry geom;`
`1594`	`1594`	`geom.d->error = error;`
`1595`	`1595`	`return geom;`
`1596`	`1596`	`}`
`1597`		`- return QgsGeometry( centroid.clone() );`
	`1597`	`+ return QgsGeometry( centroid.release() );`
`1598`	`1598`	`}`
`1599`	`1599`
`1600`	`1600`	`QgsGeometry QgsGeometry::pointOnSurface() const`