Feature #8725: fix merge changes

qgis · Dec 17, 2013 · b2d9ebb · b2d9ebb
1 parent 0324de4
commit b2d9ebb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
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() )
   {