sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-26 00:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix rendering regression

Browse Source 
In parallel rendering, make sure mFinalImage exists before drawing
labels.
This commit is contained in:
Hugo Mercier 2019-12-16 12:04:37 +01:00
parent 5d8899bd66
commit d6ee3ed520
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/qgsmaprendererparalleljob.cpp
View File

@ -228,6 +228,12 @@ void QgsMapRendererParallelJob::renderLayersFinished()
} }
} }
// compose final image for labeling
if ( mSecondPassLayerJobs.isEmpty() )
{
mFinalImage = composeImage( mSettings, mLayerJobs, mLabelJob );
}
QgsDebugMsgLevel( QStringLiteral( "PARALLEL layers finished" ), 2 ); QgsDebugMsgLevel( QStringLiteral( "PARALLEL layers finished" ), 2 );
if ( mSettings.testFlag( QgsMapSettings::DrawLabeling ) && !mLabelJob.context.renderingStopped() ) if ( mSettings.testFlag( QgsMapSettings::DrawLabeling ) && !mLabelJob.context.renderingStopped() )
@ -284,7 +290,19 @@ void QgsMapRendererParallelJob::renderingFinished()
} }
else else
{ {
renderLayersSecondPassFinished(); QgsDebugMsgLevel( QStringLiteral( "PARALLEL finished" ), 2 );
logRenderingTime( mLayerJobs, mSecondPassLayerJobs, mLabelJob );
cleanupJobs( mLayerJobs );
cleanupLabelJob( mLabelJob );
mStatus = Idle;
mRenderingTime = mRenderingStart.elapsed();
emit finished();
} }
} }