Fix crash using expression for heatmap renderer (fix #14127)

qgis · Jan 19, 2016 · e2e3604784f299273a345ded8ab600174b5fe33d · e2e3604
1 parent 23fc3cf
commit e2e3604784f299273a345ded8ab600174b5fe33d
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
diff --git a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
@@ -34,7 +34,7 @@ QgsRendererV2Widget* QgsHeatmapRendererWidget::create( QgsVectorLayer* layer, Qg
 
 static QgsExpressionContext _getExpressionContext( const void* context )
 {
-  const QgsHeatmapRendererWidget* widget = ( const QgsHeatmapRendererWidget* ) context;
+  const QgsHeatmapRendererWidget* widget = reinterpret_cast< const QgsHeatmapRendererWidget* >( context );
 
   QgsExpressionContext expContext;
   expContext << QgsExpressionContextUtils::globalScope()
@@ -80,7 +80,7 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsSt
 
   setupUi( this );
   mRadiusUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Pixel << QgsSymbolV2::MapUnit );
-  mWeightExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, mLayer );
+  mWeightExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, this );
 
   if ( renderer )
   {