qgsgeometry_cast

nyalldawson · nyalldawson · commit 29d5105c40a1 · 2018-05-26T11:00:43.000+10:00
diff --git a/src/core/qgsmaptopixelgeometrysimplifier.cpp b/src/core/qgsmaptopixelgeometrysimplifier.cpp
@@ -193,8 +193,8 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry
         const double *yData = nullptr;
         if ( flatType == QgsWkbTypes::LineString )
         {
-          xData = static_cast< const QgsLineString * >( &srcCurve )->xData();
-          yData = static_cast< const QgsLineString * >( &srcCurve )->yData();
+          xData = qgsgeometry_cast< const QgsLineString * >( &srcCurve )->xData();
+          yData = qgsgeometry_cast< const QgsLineString * >( &srcCurve )->yData();
         }
 
         for ( int i = 0; i < numPoints; ++i )
@@ -264,8 +264,8 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry
         const double *yData = nullptr;
         if ( flatType == QgsWkbTypes::LineString )
         {
-          xData = static_cast< const QgsLineString * >( &srcCurve )->xData();
-          yData = static_cast< const QgsLineString * >( &srcCurve )->yData();
+          xData = qgsgeometry_cast< const QgsLineString * >( &srcCurve )->xData();
+          yData = qgsgeometry_cast< const QgsLineString * >( &srcCurve )->yData();
         }
 
         for ( int i = 0; i < numPoints; ++i )

Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,8 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry`
`193`	`193`	`const double *yData = nullptr;`
`194`	`194`	`if ( flatType == QgsWkbTypes::LineString )`
`195`	`195`	`{`
`196`		`- xData = static_cast< const QgsLineString * >( &srcCurve )->xData();`
`197`		`- yData = static_cast< const QgsLineString * >( &srcCurve )->yData();`
	`196`	`+ xData = qgsgeometry_cast< const QgsLineString * >( &srcCurve )->xData();`
	`197`	`+ yData = qgsgeometry_cast< const QgsLineString * >( &srcCurve )->yData();`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`for ( int i = 0; i < numPoints; ++i )`
`@@ -264,8 +264,8 @@ std::unique_ptr< QgsAbstractGeometry > QgsMapToPixelSimplifier::simplifyGeometry`
`264`	`264`	`const double *yData = nullptr;`
`265`	`265`	`if ( flatType == QgsWkbTypes::LineString )`
`266`	`266`	`{`
`267`		`- xData = static_cast< const QgsLineString * >( &srcCurve )->xData();`
`268`		`- yData = static_cast< const QgsLineString * >( &srcCurve )->yData();`
	`267`	`+ xData = qgsgeometry_cast< const QgsLineString * >( &srcCurve )->xData();`
	`268`	`+ yData = qgsgeometry_cast< const QgsLineString * >( &srcCurve )->yData();`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`for ( int i = 0; i < numPoints; ++i )`