Skip to content

Commit

Permalink
fix windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed May 13, 2017
1 parent 43595f5 commit 0a942fd
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/core/symbology-ng/qgssymbolv2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -708,15 +708,16 @@ class ExpressionContextScopePopper
{
public:

ExpressionContextScopePopper() = default;
ExpressionContextScopePopper() : context( nullptr )
{}

~ExpressionContextScopePopper()
{
if ( context )
context->popScope();
}

QgsExpressionContext *context = nullptr;
QgsExpressionContext *context;
};
///@endcond PRIVATE

Expand Down Expand Up @@ -1154,10 +1155,10 @@ QgsMarkerSymbolV2::QgsMarkerSymbolV2( const QgsSymbolLayerV2List& layers )
mLayers.append( new QgsSimpleMarkerSymbolLayerV2() );
}

void QgsMarkerSymbolV2::setAngle( double ang )
void QgsMarkerSymbolV2::setAngle( double angle0 )
{
double origAngle = angle();
double angleDiff = ang - origAngle;
double angleDiff = angle0 - origAngle;
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
QgsMarkerSymbolLayerV2* markerLayer = dynamic_cast<QgsMarkerSymbolLayerV2*>( layer );
Expand Down

0 comments on commit 0a942fd

Please sign in to comment.