diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-09 15:58:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-11 08:57:13 +0000 |
| commit | cfb2a587bc59d2a0ff520dd09393f898506055d6 (patch) | |
| tree | 851ad7f79b1e453d74d3eba38047b1b70a6f7917 /vcl/source/graphic | |
| parent | b8c66c7f9b25ff88994aef92f56f61f176dc8a6f (diff) | |
rename BitmapEx::GetAlpha to GetAlphaMask
to ease the reading of code related to an upcoming patch to convert
transparency to alpha, since there is already a GetAlpha in Color.
Change-Id: I1af0f8f6dd94acfe4673c8556c7aff6c20da3f7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145209
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/graphic')
| -rw-r--r-- | vcl/source/graphic/GraphicObject2.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/graphic/UnoGraphic.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/graphic/GraphicObject2.cxx b/vcl/source/graphic/GraphicObject2.cxx index f61cabf9c5ed..e5914f2be62b 100644 --- a/vcl/source/graphic/GraphicObject2.cxx +++ b/vcl/source/graphic/GraphicObject2.cxx @@ -308,7 +308,7 @@ bool GraphicObject::ImplDrawTiled(OutputDevice& rOut, const tools::Rectangle& rA GraphicObject aAlphaGraphic; if( GetGraphic().IsAlpha() ) - aAlphaGraphic.SetGraphic(BitmapEx(GetGraphic().GetBitmapEx().GetAlpha().GetBitmap())); + aAlphaGraphic.SetGraphic(BitmapEx(GetGraphic().GetBitmapEx().GetAlphaMask().GetBitmap())); else aAlphaGraphic.SetGraphic(BitmapEx(Bitmap())); @@ -457,7 +457,7 @@ void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx, if( rBmpEx.IsAlpha() ) { - aBmpEx2 = BitmapEx( rBmpEx.GetBitmap(), rBmpEx.GetAlpha() ); + aBmpEx2 = BitmapEx( rBmpEx.GetBitmap(), rBmpEx.GetAlphaMask() ); } else { diff --git a/vcl/source/graphic/UnoGraphic.cxx b/vcl/source/graphic/UnoGraphic.cxx index 60d6d9cce86e..a1150e26ca69 100644 --- a/vcl/source/graphic/UnoGraphic.cxx +++ b/vcl/source/graphic/UnoGraphic.cxx @@ -173,7 +173,7 @@ uno::Sequence<sal_Int8> SAL_CALL Graphic::getMaskDIB() { SvMemoryStream aMemoryStream; - WriteDIB(maGraphic.GetBitmapEx().GetAlpha(), aMemoryStream, false, true); + WriteDIB(maGraphic.GetBitmapEx().GetAlphaMask(), aMemoryStream, false, true); return css::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMemoryStream.GetData()), aMemoryStream.Tell() ); } else @@ -243,7 +243,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL Graphic::applyDuotone( ::Graphic aReturnGraphic; BitmapEx aBitmapEx( aGraphic.GetBitmapEx() ); - AlphaMask aMask( aBitmapEx.GetAlpha() ); + AlphaMask aMask( aBitmapEx.GetAlphaMask() ); BitmapEx aTmpBmpEx(aBitmapEx.GetBitmap()); BitmapFilter::Filter(aTmpBmpEx, |