From 01e470f0ab49e458c57b0f28636a517b2bfb1b4a Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 21 Jan 2018 04:48:50 +1100 Subject: vcl: remove BitmapColor Color() operator BitmapColor has a Color() operator. However, this is confusing and tends to hide that the two classes aren't the same. I have converted this to GetColor(). Change-Id: I0be2dcb3fc420e7be9c8d04330e7a3fe69a5412a Reviewed-on: https://gerrit.libreoffice.org/48245 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann --- canvas/source/cairo/cairo_canvashelper.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'canvas/source') diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index a25dac85acc6..bba59a15c475 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -470,7 +470,7 @@ namespace cairocanvas else nAlpha = data[ nOff + 3 ] = 255; #endif - aColor = pBitmapReadAcc->GetPaletteColor( *pReadScan++ ); + aColor = pBitmapReadAcc->GetPaletteColor(*pReadScan++).GetColor(); #ifdef OSL_BIGENDIAN data[ nOff++ ] = sal::static_int_cast(( nAlpha*( aColor.GetRed() ) )/255 ); @@ -611,7 +611,7 @@ namespace cairocanvas for( nX = 0; nX < nWidth; nX++ ) { - aColor = pBitmapReadAcc->GetColor( nY, nX ); + aColor = pBitmapReadAcc->GetColor( nY, nX ).GetColor(); // cairo need premultiplied color values // TODO(rodo) handle endianness -- cgit