mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use transparent buffer to correctly process transparency in metafiles

Browse Source 
Otherwise the transparency gets converted into b&w mask here before
applying the gradient. Required for tdf#134052.

Change-Id: Ife00f75024f7d776fdb11e16fcafbd237f07eb04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100830
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2020-08-17 00:48:18 +03:00
parent d04c64d259
commit 4b1e208f3d
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
vcl/source/outdev/transparent.cxx
View File

@@ -750,7 +750,8 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
if( !aDstRect.IsEmpty() ) if( !aDstRect.IsEmpty() )
{ {
ScopedVclPtrInstance< VirtualDevice > xVDev; // Create transparent buffer
ScopedVclPtrInstance<VirtualDevice> xVDev(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
xVDev->mnDPIX = mnDPIX; xVDev->mnDPIX = mnDPIX;
xVDev->mnDPIY = mnDPIY; xVDev->mnDPIY = mnDPIY;
@@ -813,8 +814,6 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
} }
else else
{ {
Bitmap aPaint, aMask;
AlphaMask aAlpha;
MapMode aMap( GetMapMode() ); MapMode aMap( GetMapMode() );
Point aOutPos( PixelToLogic( aDstRect.TopLeft() ) ); Point aOutPos( PixelToLogic( aDstRect.TopLeft() ) );
const bool bOldMap = mbMap; const bool bOldMap = mbMap;
@@ -828,20 +827,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
const_cast<GDIMetaFile&>(rMtf).Play( xVDev.get(), rPos, rSize ); const_cast<GDIMetaFile&>(rMtf).Play( xVDev.get(), rPos, rSize );
const_cast<GDIMetaFile&>(rMtf).WindStart(); const_cast<GDIMetaFile&>(rMtf).WindStart();
xVDev->EnableMapMode( false ); xVDev->EnableMapMode( false );
aPaint = xVDev->GetBitmap( Point(), xVDev->GetOutputSizePixel() ); BitmapEx aPaint = xVDev->GetBitmapEx(Point(), xVDev->GetOutputSizePixel());
xVDev->EnableMapMode( bVDevOldMap ); // #i35331#: MUST NOT use EnableMapMode( sal_True ) here!
// create mask bitmap
xVDev->SetLineColor( COL_BLACK );
xVDev->SetFillColor( COL_BLACK );
xVDev->DrawRect( tools::Rectangle( xVDev->PixelToLogic( Point() ), xVDev->GetOutputSize() ) );
xVDev->SetDrawMode( DrawModeFlags::WhiteLine | DrawModeFlags::WhiteFill | DrawModeFlags::WhiteText |
DrawModeFlags::WhiteBitmap | DrawModeFlags::WhiteGradient );
const_cast<GDIMetaFile&>(rMtf).WindStart();
const_cast<GDIMetaFile&>(rMtf).Play( xVDev.get(), rPos, rSize );
const_cast<GDIMetaFile&>(rMtf).WindStart();
xVDev->EnableMapMode( false );
aMask = xVDev->GetBitmap( Point(), xVDev->GetOutputSizePixel() );
xVDev->EnableMapMode( bVDevOldMap ); // #i35331#: MUST NOT use EnableMapMode( sal_True ) here! xVDev->EnableMapMode( bVDevOldMap ); // #i35331#: MUST NOT use EnableMapMode( sal_True ) here!
// create alpha mask from gradient // create alpha mask from gradient
@@ -849,14 +835,14 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
xVDev->DrawGradient( tools::Rectangle( rPos, rSize ), rTransparenceGradient ); xVDev->DrawGradient( tools::Rectangle( rPos, rSize ), rTransparenceGradient );
xVDev->SetDrawMode( DrawModeFlags::Default ); xVDev->SetDrawMode( DrawModeFlags::Default );
xVDev->EnableMapMode( false ); xVDev->EnableMapMode( false );
xVDev->DrawMask( Point(), xVDev->GetOutputSizePixel(), aMask, COL_WHITE );
aAlpha = xVDev->GetBitmap( Point(), xVDev->GetOutputSizePixel() ); AlphaMask aAlpha(xVDev->GetBitmap(Point(), xVDev->GetOutputSizePixel()));
aAlpha.BlendWith(aPaint.GetAlpha());
xVDev.disposeAndClear(); xVDev.disposeAndClear();
EnableMapMode( false ); EnableMapMode( false );
DrawBitmapEx( aDstRect.TopLeft(), BitmapEx( aPaint, aAlpha ) ); DrawBitmapEx(aDstRect.TopLeft(), BitmapEx(aPaint.GetBitmap(), aAlpha));
EnableMapMode( bOldMap ); EnableMapMode( bOldMap );
} }
} }