Skip to content

Commit 256b265

Browse files
committed
Fix some warnings
1 parent 2d69f98 commit 256b265

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/core/layertree/qgslayertreemodellegendnode.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ QVariant QgsSymbolV2LegendNode::data( int role ) const
171171
QPixmap pix;
172172
if ( mItem.symbol() )
173173
{
174-
double scale, mupp = 0;
174+
double scale = 0.0;
175+
double mupp = 0.0;
175176
int dpi = 0;
176177
if ( model() )
177178
model()->legendMapViewData( &mupp, &dpi, &scale );

tests/src/core/testqgscomposerrotation.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ class TestQgsComposerRotation: public QObject
5454
QgsComposition* mComposition;
5555
QgsComposerShape* mComposerRect;
5656
QgsComposerLabel* mComposerLabel;
57-
QgsMapRenderer* mMapRenderer;
5857
QgsComposerMap* mComposerMap;
5958
QgsMapSettings mMapSettings;
6059
QgsRasterLayer* mRasterLayer;

tests/src/core/testqgsgeometry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ bool TestQgsGeometry::renderCheck( QString theTestName, QString theComment , int
431431
QgsRenderChecker myChecker;
432432
myChecker.setControlName( "expected_" + theTestName );
433433
myChecker.setRenderedImage( myFileName );
434-
bool myResultFlag = myChecker.compareImages( theTestName );
434+
bool myResultFlag = myChecker.compareImages( theTestName, mismatchCount );
435435
mReport += myChecker.report();
436436
return myResultFlag;
437437
}

0 commit comments

Comments
 (0)