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

Further optimisations to nonTransparentImageRect calculation

Browse Source
This commit is contained in:
Nyall Dawson 2016-10-20 08:21:33 +10:00
parent c9251c5793
commit 8c7d772f22
1 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/core/effects/qgsimageoperation.cpp
View File

@ -806,19 +806,62 @@ QRect QgsImageOperation::nonTransparentImageRect( const QImage &image, QSize min
int ymin = height; int ymin = height;
int ymax = 0; int ymax = 0;
for ( int x = 0; x < width; ++x ) // scan down till we hit something
for ( int y = 0; y < height; ++y )
{ {
for ( int y = 0; y < height; ++y ) const QRgb* imgScanline = reinterpret_cast< const QRgb* >( image.constScanLine( y ) );
for ( int x = 0; x < width; ++x )
{ {
if ( qAlpha( image.pixel( x, y ) ) ) if ( qAlpha( imgScanline[x] ) )
{ {
xmin = qMin( x, xmin ); ymin = y;
xmax = qMax( x, xmax ); xmin = x;
ymin = qMin( y, ymin ); xmax = x;
ymax = qMax( y, ymax );
} }
} }
} }
//scan up till we hit something
for ( int y = height - 1; y > ymin; --y )
{
const QRgb* imgScanline = reinterpret_cast< const QRgb* >( image.constScanLine( y ) );
for ( int x = 0; x < width; ++x )
{
if ( qAlpha( imgScanline[x] ) )
{
ymax = y;
xmin = qMin( xmin, x );
xmax = qMax( xmax, x );
}
}
}
//scan left to right till we hit something, using a refined y region
for ( int y = ymin; y <= ymax; ++y )
{
const QRgb* imgScanline = reinterpret_cast< const QRgb* >( image.constScanLine( y ) );
for ( int x = 0; x < xmin; ++x )
{
if ( qAlpha( imgScanline[x] ) )
{
xmin = x;
}
}
}
//scan right to left till we hit something, using the refined y region
for ( int y = ymin; y <= ymax; ++y )
{
const QRgb* imgScanline = reinterpret_cast< const QRgb* >( image.constScanLine( y ) );
for ( int x = width - 1; x > xmax; --x )
{
if ( qAlpha( imgScanline[x] ) )
{
xmax = x;
}
}
}
if ( minSize.isValid() ) if ( minSize.isValid() )
{ {
if ( xmax - xmin < minSize.width() ) // centers image on x if ( xmax - xmin < minSize.width() ) // centers image on x