[Libreoffice-commits] core.git: vcl/source

[Libreoffice Gerrit user]

 vcl/source/bitmap/BitmapTools.cxx |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit bb2aebce94c01070565bb84493f10bcee0fec511
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Feb 14 16:11:46 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Feb 14 18:12:18 2019 +0100

    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 at gmail.com>

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;