Skip to content
Permalink
Browse files
x_passed -> xFound
  • Loading branch information
lbartoletti authored and nyalldawson committed Jun 9, 2021
1 parent a13e213 commit 1d0e4821b1c6d30d14be70acd1d173945cbfc696
Showing with 6 additions and 6 deletions.
  1. +6 −6 src/core/geometry/qgsgeometryutils.cpp
@@ -1808,28 +1808,28 @@ void QgsGeometryUtils::weightedPointInTriangle( const double aX, const double aY

bool QgsGeometryUtils::transferFirstZOrMValueToPoint( const QgsPointSequence &points, QgsPoint &point )
{
bool z_passed = false;
bool m_passed = false;
bool zFound = false;
bool mFound = false;

for ( const QgsPoint &pt : points )
{
if ( !m_passed && pt.isMeasure() )
{
point.convertTo( QgsWkbTypes::addM( point.wkbType() ) );
point.setM( pt.m() );
m_passed = true;
mFound = true;
}
if ( !z_passed && pt.is3D() )
{
point.convertTo( QgsWkbTypes::addZ( point.wkbType() ) );
point.setZ( pt.z() );
z_passed = true;
zFound = true;
}
if ( z_passed && m_passed )
if ( zFound && mFound )
break;
}

return z_passed || m_passed;
return zFound || mFound;
}

bool QgsGeometryUtils::transferFirstMValueToPoint( const QgsPointSequence &points, QgsPoint &point )

0 comments on commit 1d0e482

Please sign in to comment.