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

Merge pull request #62405 from qgis/backport-62390-to-release-3_44

Browse Source 
[Backport release-3_44] Optimise QgsHueSaturationFilter
This commit is contained in:
Alexander Bruy 2025-06-25 05:52:08 +01:00 committed by GitHub
commit 33ee1d76c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 78 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/core/raster/qgshuesaturationfilter.cpp
View File

@ -113,10 +113,9 @@ QgsRasterBlock *QgsHueSaturationFilter::block( int bandNo, QgsRectangle const &
Q_UNUSED( bandNo )
QgsDebugMsgLevel( QStringLiteral( "width = %1 height = %2 extent = %3" ).arg( width ).arg( height ).arg( extent.toString() ), 4 );
auto outputBlock = std::make_unique<QgsRasterBlock>();
if ( !mInput )
{
return outputBlock.release();
return nullptr;
}
// At this moment we know that we read rendered image
@ -125,7 +124,7 @@ QgsRasterBlock *QgsHueSaturationFilter::block( int bandNo, QgsRectangle const &
if ( !inputBlock || inputBlock->isEmpty() )
{
QgsDebugError( QStringLiteral( "No raster data!" ) );
return outputBlock.release();
return nullptr;
}
if ( !mInvertColors && mSaturation == 0 && mGrayscaleMode == GrayscaleOff && !mColorizeOn )
@ -134,37 +133,50 @@ QgsRasterBlock *QgsHueSaturationFilter::block( int bandNo, QgsRectangle const &
return inputBlock.release();
}
auto outputBlock = std::make_unique<QgsRasterBlock>();
if ( !outputBlock->reset( Qgis::DataType::ARGB32_Premultiplied, width, height ) )
{
return outputBlock.release();
return nullptr;
}
// adjust image
QRgb myNoDataColor = qRgba( 0, 0, 0, 0 );
QRgb myRgb;
QColor myColor;
const QRgb myNoDataColor = qRgba( 0, 0, 0, 0 );
int h, s, l;
int r, g, b, alpha;
int r, g, b;
double alphaFactor = 1.0;
for ( qgssize i = 0; i < ( qgssize )width * height; i++ )
const QRgb *inputColorData = inputBlock->colorData();
const int imageHeight = inputBlock->image().height();
const int imageWidth = inputBlock->image().width();
QRgb *outputColorData = outputBlock->colorData();
for ( int row = 0; row < height; ++row )
{
if ( inputBlock->color( i ) == myNoDataColor )
if ( feedback->isCanceled() )
return nullptr;
for ( int col = 0; col < width; ++col )
{
outputBlock->setColor( i, myNoDataColor );
const qgssize i = static_cast< qgssize >( row ) * width + static_cast< qgssize >( col );
if ( !inputColorData || row >= imageHeight || col >= imageWidth || inputColorData[i] == myNoDataColor )
{
outputColorData[i] = myNoDataColor;
continue;
}
myRgb = inputBlock->color( i );
myColor = QColor( myRgb );
const QRgb inputColor = inputColorData[i];
QColor myColor = QColor( inputColor );
// Alpha must be taken from QRgb, since conversion from QRgb->QColor loses alpha
alpha = qAlpha( myRgb );
const int alpha = qAlpha( inputColor );
if ( alpha == 0 )
{
// totally transparent, no changes required
outputBlock->setColor( i, myRgb );
outputColorData[i] = inputColor;
continue;
}
@ -214,7 +226,8 @@ QgsRasterBlock *QgsHueSaturationFilter::block( int bandNo, QgsRectangle const &
b *= alphaFactor;
}
outputBlock->setColor( i, qRgba( r, g, b, alpha ) );
outputColorData[i] = qRgba( r, g, b, alpha );
}
}
return outputBlock.release();