diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-01-21 04:48:50 +1100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-06-16 15:55:34 -0400 |
commit | da91ffc94ac6772e593e13257896fec52e311eb9 (patch) | |
tree | 518c11ec82012ef5bbe7fc7420005d98c2c5e1eb /vcl/source/gdi/print2.cxx | |
parent | dcae336143f25a2fb98d4c4adee6df4e5cef4053 (diff) |
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().
Disable some tests that are failing to build due to missing << operator.
Reviewed-on: https://gerrit.libreoffice.org/48245
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 01e470f0ab49e458c57b0f28636a517b2bfb1b4a)
Change-Id: I0be2dcb3fc420e7be9c8d04330e7a3fe69a5412a
Diffstat (limited to 'vcl/source/gdi/print2.cxx')
-rw-r--r-- | vcl/source/gdi/print2.cxx | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 54a8d0af9389..9c99591ba39e 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -153,44 +153,44 @@ bool checkRect( Rectangle& io_rPrevRect, Add converted actions to this metafile */ void ImplConvertTransparentAction( GDIMetaFile& o_rMtf, - const MetaAction& rAct, - const OutputDevice& rStateOutDev, - Color aBgColor ) + const MetaAction& rAct, + const OutputDevice& rStateOutDev, + Color aBgColor ) { - if( rAct.GetType() == MetaActionType::Transparent ) + if (rAct.GetType() == MetaActionType::Transparent) { const MetaTransparentAction* pTransAct = static_cast<const MetaTransparentAction*>(&rAct); - sal_uInt16 nTransparency( pTransAct->GetTransparence() ); + sal_uInt16 nTransparency( pTransAct->GetTransparence() ); // #i10613# Respect transparency for draw color - if( nTransparency ) + if (nTransparency) { - o_rMtf.AddAction( new MetaPushAction( PushFlags::LINECOLOR|PushFlags::FILLCOLOR ) ); + o_rMtf.AddAction(new MetaPushAction(PushFlags::LINECOLOR|PushFlags::FILLCOLOR)); // assume white background for alpha blending - Color aLineColor( rStateOutDev.GetLineColor() ); - aLineColor.SetRed( static_cast<sal_uInt8>( (255*nTransparency + (100 - nTransparency)*aLineColor.GetRed()) / 100 ) ); - aLineColor.SetGreen( static_cast<sal_uInt8>( (255*nTransparency + (100 - nTransparency)*aLineColor.GetGreen()) / 100 ) ); - aLineColor.SetBlue( static_cast<sal_uInt8>( (255*nTransparency + (100 - nTransparency)*aLineColor.GetBlue()) / 100 ) ); - o_rMtf.AddAction( new MetaLineColorAction(aLineColor, true) ); - - Color aFillColor( rStateOutDev.GetFillColor() ); - aFillColor.SetRed( static_cast<sal_uInt8>( (255*nTransparency + (100 - nTransparency)*aFillColor.GetRed()) / 100 ) ); - aFillColor.SetGreen( static_cast<sal_uInt8>( (255*nTransparency + (100 - nTransparency)*aFillColor.GetGreen()) / 100 ) ); - aFillColor.SetBlue( static_cast<sal_uInt8>( (255*nTransparency + (100 - nTransparency)*aFillColor.GetBlue()) / 100 ) ); - o_rMtf.AddAction( new MetaFillColorAction(aFillColor, true) ); + Color aLineColor(rStateOutDev.GetLineColor()); + aLineColor.SetRed(static_cast<sal_uInt8>((255*nTransparency + (100 - nTransparency) * aLineColor.GetRed()) / 100)); + aLineColor.SetGreen(static_cast<sal_uInt8>((255*nTransparency + (100 - nTransparency) * aLineColor.GetGreen()) / 100)); + aLineColor.SetBlue(static_cast<sal_uInt8>((255*nTransparency + (100 - nTransparency) * aLineColor.GetBlue()) / 100)); + o_rMtf.AddAction(new MetaLineColorAction(aLineColor, true)); + + Color aFillColor(rStateOutDev.GetFillColor()); + aFillColor.SetRed(static_cast<sal_uInt8>((255*nTransparency + (100 - nTransparency)*aFillColor.GetRed()) / 100)); + aFillColor.SetGreen(static_cast<sal_uInt8>((255*nTransparency + (100 - nTransparency)*aFillColor.GetGreen()) / 100)); + aFillColor.SetBlue(static_cast<sal_uInt8>((255*nTransparency + (100 - nTransparency)*aFillColor.GetBlue()) / 100)); + o_rMtf.AddAction(new MetaFillColorAction(aFillColor, true)); } - o_rMtf.AddAction( new MetaPolyPolygonAction(pTransAct->GetPolyPolygon()) ); + o_rMtf.AddAction(new MetaPolyPolygonAction(pTransAct->GetPolyPolygon())); - if( nTransparency ) - o_rMtf.AddAction( new MetaPopAction() ); + if(nTransparency) + o_rMtf.AddAction(new MetaPopAction()); } else { BitmapEx aBmpEx; - switch( rAct.GetType() ) + switch (rAct.GetType()) { case MetaActionType::BMPEX: aBmpEx = static_cast<const MetaBmpExAction&>(rAct).GetBitmapEx(); @@ -211,65 +211,65 @@ void ImplConvertTransparentAction( GDIMetaFile& o_rMtf, break; } - Bitmap aBmp( aBmpEx.GetBitmap() ); - if( !aBmpEx.IsAlpha() ) + Bitmap aBmp(aBmpEx.GetBitmap()); + if (!aBmpEx.IsAlpha()) { // blend with mask Bitmap::ScopedReadAccess pRA(aBmp); - if( !pRA ) + if (!pRA) return; // what else should I do? - Color aActualColor( aBgColor ); + Color aActualColor(aBgColor); - if( pRA->HasPalette() ) - aActualColor = pRA->GetBestPaletteColor( aBgColor ).operator Color(); + if (pRA->HasPalette()) + aActualColor = pRA->GetBestPaletteColor(aBgColor).GetColor(); pRA.reset(); // did we get true white? - if( aActualColor.GetColorError( aBgColor ) ) + if (aActualColor.GetColorError(aBgColor)) { // no, create truecolor bitmap, then - aBmp.Convert( BmpConversion::N24Bit ); + aBmp.Convert(BmpConversion::N24Bit); // fill masked out areas white - aBmp.Replace( aBmpEx.GetMask(), aBgColor ); + aBmp.Replace(aBmpEx.GetMask(), aBgColor); } else { // fill masked out areas white - aBmp.Replace( aBmpEx.GetMask(), aActualColor ); + aBmp.Replace(aBmpEx.GetMask(), aActualColor); } } else { // blend with alpha channel - aBmp.Convert( BmpConversion::N24Bit ); - aBmp.Blend(aBmpEx.GetAlpha(),aBgColor); + aBmp.Convert(BmpConversion::N24Bit); + aBmp.Blend(aBmpEx.GetAlpha(), aBgColor); } // add corresponding action - switch( rAct.GetType() ) + switch (rAct.GetType()) { case MetaActionType::BMPEX: - o_rMtf.AddAction( new MetaBmpAction( + o_rMtf.AddAction(new MetaBmpAction( static_cast<const MetaBmpExAction&>(rAct).GetPoint(), - aBmp )); + aBmp)); break; case MetaActionType::BMPEXSCALE: - o_rMtf.AddAction( new MetaBmpScaleAction( + o_rMtf.AddAction(new MetaBmpScaleAction( static_cast<const MetaBmpExScaleAction&>(rAct).GetPoint(), static_cast<const MetaBmpExScaleAction&>(rAct).GetSize(), - aBmp )); + aBmp)); break; case MetaActionType::BMPEXSCALEPART: - o_rMtf.AddAction( new MetaBmpScalePartAction( + o_rMtf.AddAction(new MetaBmpScalePartAction( static_cast<const MetaBmpExScalePartAction&>(rAct).GetDestPoint(), static_cast<const MetaBmpExScalePartAction&>(rAct).GetDestSize(), static_cast<const MetaBmpExScalePartAction&>(rAct).GetSrcPoint(), static_cast<const MetaBmpExScalePartAction&>(rAct).GetSrcSize(), - aBmp )); + aBmp)); break; default: OSL_FAIL("Unexpected case"); |