Skip to content

Commit

Permalink
Fix crash using expression for heatmap renderer (fix #14127)
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jan 19, 2016
1 parent 23fc3cf commit e2e3604
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ QgsRendererV2Widget* QgsHeatmapRendererWidget::create( QgsVectorLayer* layer, Qg


static QgsExpressionContext _getExpressionContext( const void* context ) static QgsExpressionContext _getExpressionContext( const void* context )
{ {
const QgsHeatmapRendererWidget* widget = ( const QgsHeatmapRendererWidget* ) context; const QgsHeatmapRendererWidget* widget = reinterpret_cast< const QgsHeatmapRendererWidget* >( context );


QgsExpressionContext expContext; QgsExpressionContext expContext;
expContext << QgsExpressionContextUtils::globalScope() expContext << QgsExpressionContextUtils::globalScope()
Expand Down Expand Up @@ -80,7 +80,7 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsSt


setupUi( this ); setupUi( this );
mRadiusUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Pixel << QgsSymbolV2::MapUnit ); mRadiusUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Pixel << QgsSymbolV2::MapUnit );
mWeightExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, mLayer ); mWeightExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, this );


if ( renderer ) if ( renderer )
{ {
Expand Down

0 comments on commit e2e3604

Please sign in to comment.