summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2019-04-09 09:58:27 +0900
committerTomaž Vajngerl <quikee@gmail.com>2019-04-09 12:07:36 +0200
commit05a8749ee6f251d4b92eecb97763fa1fe94c68c8 (patch)
tree78c2be178e4e7fe3206cbe94a4751e16e8026d0a /vcl
parent13f449221e550c84bb60c368b2520148104e6da9 (diff)
remove some usages of BitmapColor outside of VCL
You get BitmapColor only from reading pixels from a Bitmap and we want to avoid usage of Bitmap outside of VCL (and use BitmapEx as the alternative which will eventually replace Bitmap). Change-Id: Iddfa3ef739bfdd4dce5fb47fd9f67a5a36f3388b Reviewed-on: https://gerrit.libreoffice.org/70447 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/bitmap/BitmapTools.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 6f14c3526d42..5610c7347755 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -1004,7 +1004,7 @@ void CanvasCairoExtractBitmapData( BitmapEx const & aBmpEx, Bitmap & aBitmap, un
return BitmapEx(aBitmap);
}
- bool isHistorical8x8(const BitmapEx& rBitmapEx, BitmapColor& o_rBack, BitmapColor& o_rFront)
+ bool isHistorical8x8(const BitmapEx& rBitmapEx, Color& o_rBack, Color& o_rFront)
{
bool bRet(false);
@@ -1026,8 +1026,8 @@ void CanvasCairoExtractBitmapData( BitmapEx const & aBmpEx, Bitmap & aBitmap, un
// #i123564# background and foreground were exchanged; of course
// rPalette[0] is the background color
- o_rFront = rPalette[1];
- o_rBack = rPalette[0];
+ o_rFront = rPalette[1].GetColor();
+ o_rBack = rPalette[0].GetColor();
bRet = true;
}