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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/_contdlg.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 847ddaf4efbd..8f296cc9f7c1 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -615,7 +615,7 @@ BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& Bitmap aMask( rBitmapEx.GetBitmap().CreateMask( rColor, nTol ) ); if( rBitmapEx.IsAlpha() ) - aMask.CombineOr( rBitmapEx.GetAlpha() ); + aMask.CombineOr( rBitmapEx.GetAlphaMask() ); aBmpEx = BitmapEx( rBitmapEx.GetBitmap(), aMask ); LeaveWait(); @@ -995,7 +995,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) { ImpMask( aBitmapEx ); if ( aGraphic.IsTransparent() ) - aGraphic = Graphic( BitmapEx( aBitmapEx.GetBitmap(), aBitmapEx.GetAlpha() ) ); + aGraphic = Graphic( BitmapEx( aBitmapEx.GetBitmap(), aBitmapEx.GetAlphaMask() ) ); else aGraphic = aBitmapEx; } diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 3ae8cba852e0..a7089208f808 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -115,7 +115,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, } } else if( rGraphic.IsTransparent() ) - aBmp = rGraphic.GetBitmapEx().GetAlpha(); + aBmp = rGraphic.GetBitmapEx().GetAlphaMask(); else { aBmp = rGraphic.GetBitmapEx().GetBitmap(); @@ -634,7 +634,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void ) Bitmap aMask = aGraphic.GetBitmapEx().GetBitmap().CreateMask( rColor, nTol ); if( aGraphic.IsTransparent() ) - aMask.CombineOr( aGraphic.GetBitmapEx().GetAlpha() ); + aMask.CombineOr( aGraphic.GetBitmapEx().GetAlphaMask() ); if( !aMask.IsEmpty() ) { |