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

nyalldawson · nyalldawson · commit e2e3604784f2 · 2016-01-19T11:09:54.000+11:00
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 )
   {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ QgsRendererV2Widget* QgsHeatmapRendererWidget::create( QgsVectorLayer* layer, Qg`
`34`	`34`
`35`	`35`	`static QgsExpressionContext _getExpressionContext( const void* context )`
`36`	`36`	`{`
`37`		`- const QgsHeatmapRendererWidget* widget = ( const QgsHeatmapRendererWidget* ) context;`
	`37`	`+ const QgsHeatmapRendererWidget* widget = reinterpret_cast< const QgsHeatmapRendererWidget* >( context );`
`38`	`38`
`39`	`39`	`QgsExpressionContext expContext;`
`40`	`40`	`expContext << QgsExpressionContextUtils::globalScope()`
`@@ -80,7 +80,7 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsSt`
`80`	`80`
`81`	`81`	`setupUi( this );`
`82`	`82`	`mRadiusUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::Pixel << QgsSymbolV2::MapUnit );`
`83`		`- mWeightExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, mLayer );`
	`83`	`+ mWeightExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, this );`
`84`	`84`
`85`	`85`	`if ( renderer )`
`86`	`86`	`{`