vcl/source/bitmap/BitmapEx.cxx | 322 +++++++++++++++++++----------------------
1 file changed, 153 insertions(+), 169 deletions(-)
New commits:
commit 3cf0b46327111830dc4e22a1f9f9af2c3e3b30ed
Author: Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sun Sep 1 04:23:02 2024 +1000
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Sep 26 13:50:48 2024 +0200
vcl: flatten functions in BitmapEx.cxx
Change-Id: I62a876ae2d517e47efc0d8abccaece3f6059b4fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173200
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx
index 9fe00bfec311..457ed4942994 100644
--- a/vcl/source/bitmap/BitmapEx.cxx
+++ b/vcl/source/bitmap/BitmapEx.cxx
@@ -253,125 +253,114 @@ BitmapChecksum BitmapEx::GetChecksum() const
bool BitmapEx::Invert()
{
- bool bRet = false;
-
if (!maBitmap.IsEmpty())
- bRet = maBitmap.Invert();
+ return maBitmap.Invert();
- return bRet;
+ return false;
}
-bool BitmapEx::Mirror( BmpMirrorFlags nMirrorFlags )
+bool BitmapEx::Mirror(BmpMirrorFlags nMirrorFlags)
{
- bool bRet = false;
+ if (maBitmap.IsEmpty())
+ return false;
- if( !maBitmap.IsEmpty() )
- {
- bRet = maBitmap.Mirror( nMirrorFlags );
+ bool bRet = maBitmap.Mirror( nMirrorFlags );
- if( bRet && !maAlphaMask.IsEmpty() )
- maAlphaMask.Mirror( nMirrorFlags );
- }
+ if (bRet && !maAlphaMask.IsEmpty())
+ maAlphaMask.Mirror(nMirrorFlags);
return bRet;
}
bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY,
BmpScaleFlag nScaleFlag )
{
- bool bRet = false;
- if( !maBitmap.IsEmpty() )
- {
- bRet = maBitmap.Scale( rScaleX, rScaleY, nScaleFlag );
+ if (maBitmap.IsEmpty())
+ return false;
- if( bRet && !maAlphaMask.IsEmpty() )
- {
- maAlphaMask.Scale( rScaleX, rScaleY, nScaleFlag );
- }
+ bool bRet = maBitmap.Scale( rScaleX, rScaleY, nScaleFlag );
- maBitmapSize = maBitmap.GetSizePixel();
+ if (bRet && !maAlphaMask.IsEmpty())
+ maAlphaMask.Scale(rScaleX, rScaleY, nScaleFlag);
- SAL_WARN_IF( !maAlphaMask.IsEmpty() && maBitmap.GetSizePixel() !=
maAlphaMask.GetSizePixel(), "vcl",
- "BitmapEx::Scale(): size mismatch for bitmap and alpha
mask." );
- }
+ maBitmapSize = maBitmap.GetSizePixel();
+
+ SAL_WARN_IF(!maAlphaMask.IsEmpty() && maBitmap.GetSizePixel() !=
maAlphaMask.GetSizePixel(), "vcl",
+ "BitmapEx::Scale(): size mismatch for bitmap and alpha mask.");
return bRet;
}
-bool BitmapEx::Scale( const Size& rNewSize, BmpScaleFlag nScaleFlag )
+static bool lcl_ShouldScale(Size const& rOrigSize, Size const& rNewSize)
{
- bool bRet;
+ return rOrigSize.Width() && rOrigSize.Height()
+ && (rNewSize.Width() != rOrigSize.Width() || rNewSize.Height() !=
rOrigSize.Height());
+}
- if (GetSizePixel().Width() && GetSizePixel().Height()
- && (rNewSize.Width() != GetSizePixel().Width()
- || rNewSize.Height() != GetSizePixel().Height() ) )
- {
- bRet = Scale( static_cast<double>(rNewSize.Width()) /
GetSizePixel().Width(),
- static_cast<double>(rNewSize.Height()) /
GetSizePixel().Height(),
- nScaleFlag );
- }
- else
+bool BitmapEx::Scale( const Size& rNewSize, BmpScaleFlag nScaleFlag )
+{
+ if (lcl_ShouldScale(GetSizePixel(), rNewSize))
{
- bRet = true;
+ return Scale(static_cast<double>(rNewSize.Width()) /
GetSizePixel().Width(),
+ static_cast<double>(rNewSize.Height()) /
GetSizePixel().Height(),
+ nScaleFlag);
}
- return bRet;
+ return true;
}
bool BitmapEx::Rotate( Degree10 nAngle10, const Color& rFillColor )
{
- bool bRet = false;
+ if (maBitmap.IsEmpty())
+ return false;
- if( !maBitmap.IsEmpty() )
- {
- const bool bTransRotate = ( COL_TRANSPARENT == rFillColor );
+ const bool bTransRotate = ( COL_TRANSPARENT == rFillColor );
- if( bTransRotate )
- {
- bRet = maBitmap.Rotate( nAngle10, COL_BLACK );
+ bool bRet = false;
- if( maAlphaMask.IsEmpty() )
- {
- maAlphaMask = Bitmap(GetSizePixel(), vcl::PixelFormat::N8_BPP,
&Bitmap::GetGreyPalette(256));
- maAlphaMask.Erase( 0 );
- }
+ if (bTransRotate)
+ {
+ bRet = maBitmap.Rotate(nAngle10, COL_BLACK);
- if( bRet && !maAlphaMask.IsEmpty() )
- maAlphaMask.Rotate( nAngle10, COL_ALPHA_TRANSPARENT );
- }
- else
+ if (maAlphaMask.IsEmpty())
{
- bRet = maBitmap.Rotate( nAngle10, rFillColor );
-
- if( bRet && !maAlphaMask.IsEmpty() )
- maAlphaMask.Rotate( nAngle10, COL_ALPHA_TRANSPARENT );
+ maAlphaMask = Bitmap(GetSizePixel(), vcl::PixelFormat::N8_BPP,
&Bitmap::GetGreyPalette(256));
+ maAlphaMask.Erase( 0 );
}
- maBitmapSize = maBitmap.GetSizePixel();
+ if (bRet && !maAlphaMask.IsEmpty())
+ maAlphaMask.Rotate(nAngle10, COL_ALPHA_TRANSPARENT);
+ }
+ else
+ {
+ bRet = maBitmap.Rotate( nAngle10, rFillColor );
- SAL_WARN_IF(!maAlphaMask.IsEmpty() && maBitmap.GetSizePixel() !=
maAlphaMask.GetSizePixel(), "vcl",
- "BitmapEx::Rotate(): size mismatch for bitmap and alpha
mask.");
+ if (bRet && !maAlphaMask.IsEmpty())
+ maAlphaMask.Rotate(nAngle10, COL_ALPHA_TRANSPARENT);
}
+ maBitmapSize = maBitmap.GetSizePixel();
+
+ SAL_WARN_IF(!maAlphaMask.IsEmpty() && maBitmap.GetSizePixel() !=
maAlphaMask.GetSizePixel(), "vcl",
+ "BitmapEx::Rotate(): size mismatch for bitmap and alpha
mask.");
+
return bRet;
}
bool BitmapEx::Crop( const tools::Rectangle& rRectPixel )
{
- bool bRet = false;
+ if (maBitmap.IsEmpty())
+ return false;
- if( !maBitmap.IsEmpty() )
- {
- bRet = maBitmap.Crop( rRectPixel );
+ bool bRet = maBitmap.Crop(rRectPixel);
- if( bRet && !maAlphaMask.IsEmpty() )
- maAlphaMask.Crop( rRectPixel );
+ if (bRet && !maAlphaMask.IsEmpty())
+ maAlphaMask.Crop(rRectPixel);
- maBitmapSize = maBitmap.GetSizePixel();
+ maBitmapSize = maBitmap.GetSizePixel();
- SAL_WARN_IF(!maAlphaMask.IsEmpty() && maBitmap.GetSizePixel() !=
maAlphaMask.GetSizePixel(), "vcl",
- "BitmapEx::Crop(): size mismatch for bitmap and alpha
mask.");
- }
+ SAL_WARN_IF(!maAlphaMask.IsEmpty() && maBitmap.GetSizePixel() !=
maAlphaMask.GetSizePixel(), "vcl",
+ "BitmapEx::Crop(): size mismatch for bitmap and alpha mask.");
return bRet;
}
@@ -381,16 +370,14 @@ bool BitmapEx::Convert( BmpConversion eConversion )
return !maBitmap.IsEmpty() && maBitmap.Convert( eConversion );
}
-void BitmapEx::Expand( sal_Int32 nDX, sal_Int32 nDY, bool bExpandTransparent )
+void BitmapEx::Expand(sal_Int32 nDX, sal_Int32 nDY, bool bExpandTransparent)
{
- bool bRet = false;
-
- if( maBitmap.IsEmpty() )
+ if (maBitmap.IsEmpty())
return;
- bRet = maBitmap.Expand( nDX, nDY );
+ bool bRet = maBitmap.Expand( nDX, nDY );
- if( bRet && !maAlphaMask.IsEmpty() )
+ if ( bRet && !maAlphaMask.IsEmpty() )
{
Color aColor( bExpandTransparent ? COL_ALPHA_TRANSPARENT :
COL_ALPHA_OPAQUE );
maAlphaMask.Expand( nDX, nDY, &aColor );
@@ -436,23 +423,22 @@ bool BitmapEx::CopyPixel( const tools::Rectangle&
rRectDst, const tools::Rectang
bool BitmapEx::Erase( const Color& rFillColor )
{
- bool bRet = false;
+ if (maBitmap.IsEmpty())
+ return false;
- if( !maBitmap.IsEmpty() )
- {
- bRet = maBitmap.Erase( rFillColor );
+ if (!maBitmap.Erase(rFillColor))
+ return false;
- if( bRet && !maAlphaMask.IsEmpty() )
- {
- // Respect transparency on fill color
- if( rFillColor.IsTransparent() )
- maAlphaMask.Erase( 255 - rFillColor.GetAlpha() );
- else
- maAlphaMask.Erase( 0 );
- }
+ if (!maAlphaMask.IsEmpty())
+ {
+ // Respect transparency on fill color
+ if (rFillColor.IsTransparent())
+ maAlphaMask.Erase(255 - rFillColor.GetAlpha());
+ else
+ maAlphaMask.Erase(0);
}
- return bRet;
+ return true;
}
void BitmapEx::Replace( const Color& rSearchColor, const Color& rReplaceColor )
@@ -487,7 +473,7 @@ void BitmapEx::Draw( OutputDevice* pOutDev,
pOutDev->DrawBitmapEx( rDestPt, rDestSize, *this );
}
-BitmapEx BitmapEx:: AutoScaleBitmap(BitmapEx const & aBitmap, const
tools::Long aStandardSize)
+BitmapEx BitmapEx::AutoScaleBitmap(BitmapEx const & aBitmap, const tools::Long
aStandardSize)
{
Point aEmptyPoint(0,0);
double imgposX = 0;
@@ -761,16 +747,14 @@ BitmapEx BitmapEx::getTransformed(
const basegfx::B2DRange& rVisibleRange,
double fMaximumArea) const
{
- BitmapEx aRetval;
-
- if(IsEmpty())
- return aRetval;
+ if (IsEmpty())
+ return BitmapEx();
const sal_uInt32 nSourceWidth(GetSizePixel().Width());
const sal_uInt32 nSourceHeight(GetSizePixel().Height());
- if(!nSourceWidth || !nSourceHeight)
- return aRetval;
+ if (!nSourceWidth || !nSourceHeight)
+ return BitmapEx();
// Get aOutlineRange
basegfx::B2DRange aOutlineRange(0.0, 0.0, 1.0, 1.0);
@@ -789,10 +773,8 @@ BitmapEx BitmapEx::getTransformed(
double fWidth(aVisibleRange.getWidth());
double fHeight(aVisibleRange.getHeight());
- if(fWidth < 1.0 || fHeight < 1.0)
- {
- return aRetval;
- }
+ if (fWidth < 1.0 || fHeight < 1.0)
+ return BitmapEx();
// test if discrete size (pixel) maybe too big and limit it
const double fArea(fWidth * fHeight);
@@ -832,9 +814,7 @@ BitmapEx BitmapEx::getTransformed(
aTransform.invert();
// create bitmap using source, destination and linear back-transformation
- aRetval = TransformBitmapEx(fWidth, fHeight, aTransform);
-
- return aRetval;
+ return TransformBitmapEx(fWidth, fHeight, aTransform);
}
namespace
@@ -1314,7 +1294,6 @@ tools::Polygon BitmapEx::GetContour( bool
bContourEdgeDetect,
const tools::Rectangle* pWorkRectPixel )
{
Bitmap aWorkBmp;
- tools::Polygon aRetPoly;
tools::Rectangle aWorkRect( Point(), maBitmap.GetSizePixel() );
if( pWorkRectPixel )
@@ -1322,91 +1301,96 @@ tools::Polygon BitmapEx::GetContour( bool
bContourEdgeDetect,
aWorkRect.Normalize();
- if( ( aWorkRect.GetWidth() > 4 ) && ( aWorkRect.GetHeight() > 4 ) )
- {
- // if the flag is set, we need to detect edges
- if( bContourEdgeDetect )
- aWorkBmp = DetectEdges( maBitmap );
- else
- aWorkBmp = maBitmap;
+ if ((aWorkRect.GetWidth() <= 4) || (aWorkRect.GetHeight() <= 4))
+ return tools::Polygon();
+
+ // if the flag is set, we need to detect edges
+ if( bContourEdgeDetect )
+ aWorkBmp = DetectEdges( maBitmap );
+ else
+ aWorkBmp = maBitmap;
+
+ BitmapScopedReadAccess pAcc(aWorkBmp);
+
+ const tools::Long nWidth = pAcc ? pAcc->Width() : 0;
+ const tools::Long nHeight = pAcc ? pAcc->Height() : 0;
- BitmapScopedReadAccess pAcc(aWorkBmp);
+ if (!pAcc || !nWidth || !nHeight)
+ return tools::Polygon();
- const tools::Long nWidth = pAcc ? pAcc->Width() : 0;
- const tools::Long nHeight = pAcc ? pAcc->Height() : 0;
+ const tools::Long nStartX1 = aWorkRect.Left() + 1;
+ const tools::Long nEndX1 = aWorkRect.Right();
+ const tools::Long nStartX2 = nEndX1 - 1;
+ const tools::Long nStartY1 = aWorkRect.Top() + 1;
+ const tools::Long nEndY1 = aWorkRect.Bottom();
+
+ sal_uInt16 nPolyPos = 0;
+
+ // tdf#161833 treat semi-transparent pixels as opaque
+ // Limiting the contour wrapping polygon to only opaque pixels
+ // causes clipping of any shadows or other semi-transparent
+ // areas in the image. So, instead of testing for fully opaque
+ // pixels, treat pixels that are not fully transparent as opaque.
+ // tdf#162062 only apply fix for tdf#161833 if there is a palette
+ const BitmapColor aTransparent = pAcc->GetBestMatchingColor(
pAcc->HasPalette() ? COL_ALPHA_TRANSPARENT : COL_ALPHA_OPAQUE );
+
+ std::unique_ptr<Point[]> pPoints1;
+ std::unique_ptr<Point[]> pPoints2;
+
+ pPoints1.reset(new Point[ nHeight ]);
+ pPoints2.reset(new Point[ nHeight ]);
+
+ for (tools::Long nY = nStartY1; nY < nEndY1; nY++ )
+ {
+ tools::Long nX = nStartX1;
+ Scanline pScanline = pAcc->GetScanline( nY );
- if (pAcc && nWidth && nHeight)
+ // scan row from left to right
+ while( nX < nEndX1 )
{
- const Size& rPrefSize = aWorkBmp.GetPrefSize();
- const double fFactorX =
static_cast<double>(rPrefSize.Width()) / nWidth;
- const double fFactorY =
static_cast<double>(rPrefSize.Height()) / nHeight;
- const tools::Long nStartX1 = aWorkRect.Left() + 1;
- const tools::Long nEndX1 = aWorkRect.Right();
- const tools::Long nStartX2 = nEndX1 - 1;
- const tools::Long nStartY1 = aWorkRect.Top() + 1;
- const tools::Long nEndY1 = aWorkRect.Bottom();
- std::unique_ptr<Point[]> pPoints1;
- std::unique_ptr<Point[]> pPoints2;
- tools::Long nX, nY;
- sal_uInt16 nPolyPos = 0;
- // tdf#161833 treat semi-transparent pixels as opaque
- // Limiting the contour wrapping polygon to only opaque pixels
- // causes clipping of any shadows or other semi-transparent
- // areas in the image. So, instead of testing for fully opaque
- // pixels, treat pixels that are not fully transparent as opaque.
- // tdf#162062 only apply fix for tdf#161833 if there is a palette
- const BitmapColor aTransparent = pAcc->GetBestMatchingColor(
pAcc->HasPalette() ? COL_ALPHA_TRANSPARENT : COL_ALPHA_OPAQUE );
-
- pPoints1.reset(new Point[ nHeight ]);
- pPoints2.reset(new Point[ nHeight ]);
-
- for ( nY = nStartY1; nY < nEndY1; nY++ )
+ if( aTransparent != pAcc->GetPixelFromData( pScanline, nX ) )
{
- nX = nStartX1;
- Scanline pScanline = pAcc->GetScanline( nY );
+ pPoints1[ nPolyPos ] = Point( nX, nY );
+ nX = nStartX2;
- // scan row from left to right
- while( nX < nEndX1 )
+ // this loop always breaks eventually as there is at least one
pixel
+ while( true )
{
if( aTransparent != pAcc->GetPixelFromData( pScanline, nX
) )
{
- pPoints1[ nPolyPos ] = Point( nX, nY );
- nX = nStartX2;
-
- // this loop always breaks eventually as there is at
least one pixel
- while( true )
- {
- if( aTransparent != pAcc->GetPixelFromData(
pScanline, nX ) )
- {
- pPoints2[ nPolyPos ] = Point( nX, nY );
- break;
- }
-
- nX--;
- }
-
- nPolyPos++;
+ pPoints2[ nPolyPos ] = Point( nX, nY );
break;
}
- nX++;
+ nX--;
}
+
+ nPolyPos++;
+ break;
}
- const sal_uInt16 nNewSize1 = nPolyPos << 1;
+ nX++;
+ }
+ }
- aRetPoly = tools::Polygon( nPolyPos, pPoints1.get() );
- aRetPoly.SetSize( nNewSize1 + 1 );
- aRetPoly[ nNewSize1 ] = aRetPoly[ 0 ];
+ const sal_uInt16 nNewSize1 = nPolyPos << 1;
- for( sal_uInt16 j = nPolyPos; nPolyPos < nNewSize1; )
- aRetPoly[ nPolyPos++ ] = pPoints2[ --j ];
+ tools::Polygon aRetPoly(nPolyPos, pPoints1.get());
+ aRetPoly.SetSize( nNewSize1 + 1 );
+ aRetPoly[ nNewSize1 ] = aRetPoly[ 0 ];
- if( ( fFactorX != 0. ) && ( fFactorY != 0. ) )
- aRetPoly.Scale( fFactorX, fFactorY );
- }
+ for( sal_uInt16 j = nPolyPos; nPolyPos < nNewSize1; )
+ {
+ aRetPoly[ nPolyPos++ ] = pPoints2[ --j ];
}
+ Size const& rPrefSize = aWorkBmp.GetPrefSize();
+ const double fFactorX = static_cast<double>(rPrefSize.Width()) / nWidth;
+ const double fFactorY = static_cast<double>(rPrefSize.Height()) / nHeight;
+
+ if( ( fFactorX != 0. ) && ( fFactorY != 0. ) )
+ aRetPoly.Scale( fFactorX, fFactorY );
+
return aRetPoly;
}
