sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix crasher when rendering a symbol layer subsequent to

Browse Source 
rendering a geometry generator layer

Fixes #19121 https://issues.qgis.org/issues/19121
This commit is contained in:
Matthias Kuhn 2018-07-03 08:24:47 -05:00 committed by Mathieu Pellerin
parent 4f8c9e18ab
commit 5c855b417f
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/symbology/qgssymbol.cpp
View File

@ -688,6 +688,27 @@ class ExpressionContextScopePopper
QgsExpressionContext *context = nullptr; QgsExpressionContext *context = nullptr;
}; };
/**
* RAII class to restore original geometry on a render context on destruction
*/
class GeometryRestorer
{
public:
GeometryRestorer( QgsRenderContext &context )
: mContext( context ),
mGeometry( context.geometry() )
{}
~GeometryRestorer()
{
mContext.setGeometry( mGeometry );
}
private:
QgsRenderContext &mContext;
const QgsAbstractGeometry *mGeometry;
};
///@endcond PRIVATE ///@endcond PRIVATE
void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &context, int layer, bool selected, bool drawVertexMarker, int currentVertexMarkerType, int currentVertexMarkerSize ) void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &context, int layer, bool selected, bool drawVertexMarker, int currentVertexMarkerType, int currentVertexMarkerSize )
@ -698,6 +719,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont
return; return;
} }
GeometryRestorer geomRestorer( context );
QgsGeometry segmentizedGeometry = geom; QgsGeometry segmentizedGeometry = geom;
bool usingSegmentizedGeometry = false; bool usingSegmentizedGeometry = false;
context.setGeometry( geom.constGet() ); context.setGeometry( geom.constGet() );