Revert "replace convertTo/set by add{M,Z}Value"

This reverts commit 739e6d5.
qgis · Jun 9, 2021 · 6d5411b · 6d5411b
1 parent 7c0f3a1
commit 6d5411b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp
@@ -1815,12 +1815,14 @@ bool QgsGeometryUtils::transferFirstZOrMValueToPoint( const QgsPointSequence &po
   {
     if ( !mFound && pt.isMeasure() )
     {
-      point.addMValue( pt.m() );
+      point.convertTo( QgsWkbTypes::addM( point.wkbType() ) );
+      point.setM( pt.m() );
       mFound = true;
     }
     if ( !zFound && pt.is3D() )
     {
-      point.addZValue( pt.z() );
+      point.convertTo( QgsWkbTypes::addZ( point.wkbType() ) );
+      point.setZ( pt.z() );
       zFound = true;
     }
     if ( zFound && mFound )
@@ -1862,7 +1864,8 @@ bool QgsGeometryUtils::transferFirstMValueToPoint( const QgsPointSequence &point
   {
     if ( pt.isMeasure() )
     {
-      point.addMValue( pt.m() );
+      point.convertTo( QgsWkbTypes::addM( point.wkbType() ) );
+      point.setM( pt.m() );
       rc = true;
       break;
     }
@@ -1879,7 +1882,8 @@ bool QgsGeometryUtils::transferFirstZValueToPoint( const QgsPointSequence &point
   {
     if ( pt.is3D() )
     {
-      point.addZValue( pt.z() );
+      point.convertTo( QgsWkbTypes::addZ( point.wkbType() ) );
+      point.setZ( pt.z() );
       rc = true;
       break;
     }