Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix crashes when attempting to export reprojected raster layers
Fixes #33801
  • Loading branch information
nyalldawson committed Jan 19, 2020
1 parent 065c25c commit bbd055c
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/core/raster/qgsrasterfilewriter.cpp
Expand Up @@ -523,6 +523,9 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
{
partDestProvider->setNoDataValue( i, destNoDataValueList.value( i - 1 ) );
}
if ( destBlockList[ i - 1 ]->isEmpty() )
continue;

if ( !partDestProvider->write( destBlockList[i - 1]->bits( 0 ), i, iterCols, iterRows, 0, 0 ) )
{
return WriteError;
Expand All @@ -536,6 +539,9 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
//loop over data
for ( int i = 1; i <= nBands; ++i )
{
if ( destBlockList[ i - 1 ]->isEmpty() )
continue;

if ( !destProvider->write( destBlockList[i - 1]->bits( 0 ), i, iterCols, iterRows, iterLeft, iterTop ) )
{
return WriteError;
Expand Down Expand Up @@ -643,7 +649,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
std::unique_ptr< QgsRasterBlock > inputBlock;
while ( iter->readNextRasterPart( 1, iterCols, iterRows, inputBlock, iterLeft, iterTop ) )
{
if ( !inputBlock )
if ( !inputBlock || inputBlock->isEmpty() )
{
continue;
}
Expand Down

0 comments on commit bbd055c

Please sign in to comment.