Skip to content

Commit

Permalink
Fix some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Nov 19, 2014
1 parent 2d69f98 commit 256b265
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/core/layertree/qgslayertreemodellegendnode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
1 change: 0 additions & 1 deletion tests/src/core/testqgscomposerrotation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ class TestQgsComposerRotation: public QObject
QgsComposition* mComposition;
QgsComposerShape* mComposerRect;
QgsComposerLabel* mComposerLabel;
QgsMapRenderer* mMapRenderer;
QgsComposerMap* mComposerMap;
QgsMapSettings mMapSettings;
QgsRasterLayer* mRasterLayer;
Expand Down
2 changes: 1 addition & 1 deletion tests/src/core/testqgsgeometry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 256b265

Please sign in to comment.