summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2019-02-14 16:11:46 +0100
committerTomaž Vajngerl <quikee@gmail.com>2019-02-14 18:12:18 +0100
commitbb2aebce94c01070565bb84493f10bcee0fec511 (patch)
tree3cf8dbe2bdc6336fe651459077f42b7bd2ea5744
parente1a5dd01bdaee3cac2edeb8c9d568c92ed8c4011 (diff)
don't need a special function to get the BlueOrIndex color
Change-Id: Idee5a82f8b69a25afa603ce8743d071d0093d617 Reviewed-on: https://gerrit.libreoffice.org/67824 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--vcl/source/bitmap/BitmapTools.cxx8
1 files changed, 1 insertions, 7 deletions
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index ab21b082ad40..9762c27280cd 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -648,12 +648,6 @@ css::uno::Sequence< sal_Int8 > GetMaskDIB(BitmapEx const & aBmpEx)
return css::uno::Sequence< sal_Int8 >();
}
-static sal_uInt8 lcl_GetColor(BitmapColor const& rColor)
-{
- return rColor.GetBlueOrIndex();
-}
-
-
static bool readAlpha( BitmapReadAccess const * pAlphaReadAcc, long nY, const long nWidth, unsigned char* data, long nOff )
{
bool bIsAlpha = false;
@@ -682,7 +676,7 @@ static bool readAlpha( BitmapReadAccess const * pAlphaReadAcc, long nY, const lo
BitmapColor const& rColor(
pAlphaReadAcc->GetPaletteColor(*pReadScan));
pReadScan++;
- nAlpha = data[ nOff ] = 255 - lcl_GetColor(rColor);
+ nAlpha = data[ nOff ] = 255 - rColor.GetBlueOrIndex();
if( nAlpha != 255 )
bIsAlpha = true;
nOff += 4;