fix WITH_3D=TRUE build

qgis · Oct 26, 2017 · 13ba577 · 13ba577
1 parent dc32514
commit 13ba577
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/3d/qgs3dutils.cpp b/src/3d/qgs3dutils.cpp
@@ -171,7 +171,7 @@ QList<QVector3D> Qgs3DUtils::positions( const Qgs3DMapSettings &map, QgsVectorLa
     if ( f.geometry().isNull() )
       continue;
 
-    const QgsAbstractGeometry *g = f.geometry().geometry();
+    const QgsAbstractGeometry *g = f.geometry().constGet();
     if ( const QgsPoint *pt = qgsgeometry_cast< const QgsPoint *>( g ) )
     {
       // TODO: use Z coordinates if the point is 3D

diff --git a/src/3d/symbols/qgsline3dsymbol_p.cpp b/src/3d/symbols/qgsline3dsymbol_p.cpp
@@ -112,10 +112,10 @@ Qt3DRender::QGeometryRenderer *QgsLine3DSymbolEntityNode::renderer( const Qgs3DM
     QgsGeometry geom = f.geometry();
 
     // segmentize curved geometries if necessary
-    if ( QgsWkbTypes::isCurvedType( geom.geometry()->wkbType() ) )
-      geom = QgsGeometry( geom.geometry()->segmentize() );
+    if ( QgsWkbTypes::isCurvedType( geom.constGet()->wkbType() ) )
+      geom = QgsGeometry( geom.constGet()->segmentize() );
 
-    const QgsAbstractGeometry *g = geom.geometry();
+    const QgsAbstractGeometry *g = geom.constGet();
 
     QgsGeos engine( g );
     QgsAbstractGeometry *buffered = engine.buffer( symbol.width() / 2., nSegments, endCapStyle, joinStyle, mitreLimit ); // factory

diff --git a/src/3d/symbols/qgspolygon3dsymbol_p.cpp b/src/3d/symbols/qgspolygon3dsymbol_p.cpp
@@ -142,10 +142,10 @@ Qt3DRender::QGeometryRenderer *QgsPolygon3DSymbolEntityNode::renderer( const Qgs
     QgsGeometry geom = f.geometry();
 
     // segmentize curved geometries if necessary
-    if ( QgsWkbTypes::isCurvedType( geom.geometry()->wkbType() ) )
-      geom = QgsGeometry( geom.geometry()->segmentize() );
+    if ( QgsWkbTypes::isCurvedType( geom.constGet()->wkbType() ) )
+      geom = QgsGeometry( geom.constGet()->segmentize() );
 
-    const QgsAbstractGeometry *g = geom.geometry();
+    const QgsAbstractGeometry *g = geom.constGet();
 
     ctx.setFeature( f );
     float height = symbol.height();