Fix diagrams

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15513 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: mhugent

src/core/qgsmaprenderer.h

@@ -74,7 +74,7 @@ class QgsLabelingEngineInterface
     //! @note: this method was added in version 1.6
     virtual int prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices, QgsRenderContext& ctx ) = 0;
     //! adds a diagram layer to the labeling engine
-    virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings& s ) { return 0; };
+    virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings* s ) { return 0; }
     //! called for every feature
     virtual void registerFeature( QgsVectorLayer* layer, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() ) = 0;
     //! called for every diagram feature

src/core/qgsvectorlayer.cpp

@@ -5191,7 +5191,7 @@ void QgsVectorLayer::prepareLabelingAndDiagrams( QgsRenderContext& rendererConte
     if ( mDiagramRenderer && mDiagramLayerSettings )
     {
       mDiagramLayerSettings->renderer = mDiagramRenderer;
-      rendererContext.labelingEngine()->addDiagramLayer( this, *mDiagramLayerSettings );
+      rendererContext.labelingEngine()->addDiagramLayer( this, mDiagramLayerSettings );
       //add attributes needed by the diagram renderer
       QList<int> att = mDiagramRenderer->diagramAttributes();
       QList<int>::const_iterator attIt = att.constBegin();