diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-14 11:11:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-26 08:44:50 +0200 |
| commit | bea081b5099786e5fcadddd72c247b9a9488286a (patch) | |
| tree | dd165f81e850cb9bcfa23b713bd60e3fb26d21ee /vcl/source/outdev/pixel.cxx | |
| parent | a488c7ad2763b944713997911c1ddb0315d8c93f (diff) | |
replace SalColor with Color
Change-Id: I615640a378a61cf6e44e84a647ce06bdd8a52807
Reviewed-on: https://gerrit.libreoffice.org/51239
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/outdev/pixel.cxx')
| -rw-r--r-- | vcl/source/outdev/pixel.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vcl/source/outdev/pixel.cxx b/vcl/source/outdev/pixel.cxx index afa4673cce33..04f35b41e777 100644 --- a/vcl/source/outdev/pixel.cxx +++ b/vcl/source/outdev/pixel.cxx @@ -33,7 +33,6 @@ Color OutputDevice::GetPixel( const Point& rPt ) const { - Color aColor; if ( mpGraphics || AcquireGraphics() ) @@ -45,10 +44,7 @@ Color OutputDevice::GetPixel( const Point& rPt ) const { const long nX = ImplLogicXToDevicePixel( rPt.X() ); const long nY = ImplLogicYToDevicePixel( rPt.Y() ); - const SalColor aSalCol = mpGraphics->GetPixel( nX, nY, this ); - aColor.SetRed( SALCOLOR_RED( aSalCol ) ); - aColor.SetGreen( SALCOLOR_GREEN( aSalCol ) ); - aColor.SetBlue( SALCOLOR_BLUE( aSalCol ) ); + aColor = mpGraphics->GetPixel( nX, nY, this ); } } return aColor; @@ -107,7 +103,7 @@ void OutputDevice::DrawPixel( const Point& rPt, const Color& rColor ) if ( mbOutputClipped ) return; - mpGraphics->DrawPixel( aPt.X(), aPt.Y(), ImplColorToSal( aColor ), this ); + mpGraphics->DrawPixel( aPt.X(), aPt.Y(), aColor, this ); if( mpAlphaVDev ) mpAlphaVDev->DrawPixel( rPt ); @@ -150,7 +146,7 @@ void OutputDevice::DrawPixel( const tools::Polygon& rPts, const Color* pColors ) for ( sal_uInt16 i = 0; i < nSize; i++ ) { const Point aPt( ImplLogicToDevicePixel( rPts[ i ] ) ); - mpGraphics->DrawPixel( aPt.X(), aPt.Y(), ImplColorToSal( pColors[ i ] ), this ); + mpGraphics->DrawPixel( aPt.X(), aPt.Y(), pColors[ i ], this ); } } } |