Fix some warnings

qgis · Nov 19, 2014 · 256b2652c3483727dbcfeaa99e81d60f5acc2afd · 256b265
1 parent 2d69f98
commit 256b2652c3483727dbcfeaa99e81d60f5acc2afd
Unified Split

Showing with 3 additions and 3 deletions.

+2 −1 src/core/layertree/qgslayertreemodellegendnode.cpp

+0 −1 tests/src/core/testqgscomposerrotation.cpp

+1 −1 tests/src/core/testqgsgeometry.cpp
diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -171,7 +171,8 @@ QVariant QgsSymbolV2LegendNode::data( int role ) const
       QPixmap pix;
       if ( mItem.symbol() )
       {
-        double scale, mupp = 0;
+        double scale = 0.0;
+        double mupp = 0.0;
         int dpi = 0;
         if ( model() )
           model()->legendMapViewData( &mupp, &dpi, &scale );

diff --git a/tests/src/core/testqgscomposerrotation.cpp b/tests/src/core/testqgscomposerrotation.cpp
@@ -54,7 +54,6 @@ class TestQgsComposerRotation: public QObject
     QgsComposition* mComposition;
     QgsComposerShape* mComposerRect;
     QgsComposerLabel* mComposerLabel;
-    QgsMapRenderer* mMapRenderer;
     QgsComposerMap* mComposerMap;
     QgsMapSettings mMapSettings;
     QgsRasterLayer* mRasterLayer;

diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -431,7 +431,7 @@ bool TestQgsGeometry::renderCheck( QString theTestName, QString theComment , int
   QgsRenderChecker myChecker;
   myChecker.setControlName( "expected_" + theTestName );
   myChecker.setRenderedImage( myFileName );
-  bool myResultFlag = myChecker.compareImages( theTestName );
+  bool myResultFlag = myChecker.compareImages( theTestName, mismatchCount );
   mReport += myChecker.report();
   return myResultFlag;
 }