Feature #8725: fix merge changes

ahuarte47 · ahuarte47 · commit b2d9ebb98b88 · 2013-12-17T15:50:12.000+01:00
diff --git a/src/core/qgsfeaturerequest.cpp b/src/core/qgsfeaturerequest.cpp
@@ -56,6 +56,9 @@ QgsFeatureRequest::QgsFeatureRequest( const QgsExpression& expr )
     : mFilter( FilterExpression )
     , mFilterExpression( new QgsExpression( expr.expression() ) )
     , mFlags( 0 )
+    , mMapCoordTransform( NULL )
+    , mMapToPixel( NULL )
+    , mMapToPixelTol( QgsFeatureRequest::MAPTOPIXEL_THRESHOLD_DEFAULT )
 {
 }
 
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -681,7 +681,7 @@ void QgsGradientFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QList
     p->translate( offset );
   }
 
-  _renderPolygon( p, points, rings );
+  _renderPolygon( p, points, rings, context );
 
   if ( !mOffset.isNull() )
   {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@ QgsFeatureRequest::QgsFeatureRequest( const QgsExpression& expr )`
`56`	`56`	`: mFilter( FilterExpression )`
`57`	`57`	`, mFilterExpression( new QgsExpression( expr.expression() ) )`
`58`	`58`	`, mFlags( 0 )`
	`59`	`+ , mMapCoordTransform( NULL )`
	`60`	`+ , mMapToPixel( NULL )`
	`61`	`+ , mMapToPixelTol( QgsFeatureRequest::MAPTOPIXEL_THRESHOLD_DEFAULT )`
`59`	`62`	`{`
`60`	`63`	`}`
`61`	`64`
Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,7 @@ void QgsGradientFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QList`
`681`	`681`	`p->translate( offset );`
`682`	`682`	`}`
`683`	`683`
`684`		`- _renderPolygon( p, points, rings );`
	`684`	`+ _renderPolygon( p, points, rings, context );`
`685`	`685`
`686`	`686`	`if ( !mOffset.isNull() )`
`687`	`687`	`{`