Skip to content

Commit 4d0413a

Browse files
committed
avoid warning about not created test difference image
(cherry picked from commit d40d481)
1 parent 3c70150 commit 4d0413a

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/core/qgsrenderchecker.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
#include <QDebug>
2828
#include <QBuffer>
2929

30-
QgsRenderChecker::QgsRenderChecker() :
31-
mReport( "" ),
32-
mMatchTarget( 0 ),
33-
mElapsedTime( 0 ),
34-
mRenderedImageFile( "" ),
35-
mExpectedImageFile( "" ),
36-
mMismatchCount( 0 ),
37-
mColorTolerance( 0 ),
38-
mElapsedTimeTarget( 0 ),
39-
mBufferDashMessages( false )
30+
QgsRenderChecker::QgsRenderChecker()
31+
: mReport( "" )
32+
, mMatchTarget( 0 )
33+
, mElapsedTime( 0 )
34+
, mRenderedImageFile( "" )
35+
, mExpectedImageFile( "" )
36+
, mMismatchCount( 0 )
37+
, mColorTolerance( 0 )
38+
, mElapsedTimeTarget( 0 )
39+
, mBufferDashMessages( false )
4040
{
4141
}
4242

@@ -359,7 +359,6 @@ bool QgsRenderChecker::compareImages( QString theTestName,
359359
//
360360
emitDashMessage( "Rendered Image " + theTestName + prefix, QgsDartMeasurement::ImagePng, mRenderedImageFile );
361361
emitDashMessage( "Expected Image " + theTestName + prefix, QgsDartMeasurement::ImagePng, mExpectedImageFile );
362-
emitDashMessage( "Difference Image " + theTestName + prefix, QgsDartMeasurement::ImagePng, myDiffImageFile );
363362

364363
//
365364
// Put the same info to debug too
@@ -430,6 +429,7 @@ bool QgsRenderChecker::compareImages( QString theTestName,
430429
//save the diff image to disk
431430
//
432431
myDifferenceImage.save( myDiffImageFile );
432+
emitDashMessage( "Difference Image " + theTestName + prefix, QgsDartMeasurement::ImagePng, myDiffImageFile );
433433
delete maskImage;
434434

435435
//

src/gui/qgscomposerruler.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ QgsComposerRuler::QgsComposerRuler( QgsComposerRuler::Direction d ) : QWidget( 0
2525
mRulerFont->setPointSize( RULER_FONT_SIZE );
2626
mRulerFontMetrics = new QFontMetrics( *mRulerFont );
2727

28-
//calculate ruler sizes and marker seperations
28+
//calculate ruler sizes and marker separations
2929

3030
//minimum gap required between major ticks is 3 digits * 250%, based on appearance
3131
mScaleMinPixelsWidth = mRulerFontMetrics->width( "000" ) * 2.5;
@@ -345,7 +345,7 @@ int QgsComposerRuler::optimumNumberDivisions( double rulerScale, int scaleMultip
345345
{
346346
//find pixel size for this small division
347347
double candidateSize = largeDivisionSize / ( *divisions_it );
348-
//check if this seperation is more then allowed min seperation
348+
//check if this separation is more then allowed min separation
349349
if ( candidateSize >= mMinPixelsPerDivision )
350350
{
351351
//found a good candidate, return it

0 commit comments

Comments
 (0)