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

Resolves: tdf#111073 incorrect gif background color

Browse Source 
a) set correct palette entries for the 1bit bitmap returned
b) only use a BITMASK for the mask (like its AnimatedGraphicPrimitive2D
brother in drawinglayer does)

Change-Id: I704997de554dc4d0e523458d45ab329815b5046a
Reviewed-on: https://gerrit.libreoffice.org/41905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2017-09-04 17:12:02 +01:00
parent a89c3dc4b0
commit 67951d08dd
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slideshow/source/engine/shapes/gdimtftools.cxx
View File

@@ -285,7 +285,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames,
pVDev->EnableMapMode( false ); pVDev->EnableMapMode( false );
// setup mask VDev (alpha VDev is currently rather slow) // setup mask VDev (alpha VDev is currently rather slow)
ScopedVclPtrInstance< VirtualDevice > pVDevMask; ScopedVclPtrInstance<VirtualDevice> pVDevMask(DeviceFormat::BITMASK);
pVDevMask->SetOutputSizePixel( aAnimSize ); pVDevMask->SetOutputSizePixel( aAnimSize );
pVDevMask->EnableMapMode( false ); pVDevMask->EnableMapMode( false );

9
vcl/headless/svpgdi.cxx
View File

@@ -1145,7 +1145,14 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rTR,
SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight ) SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight )
{ {
SvpSalBitmap* pBitmap = new SvpSalBitmap(); SvpSalBitmap* pBitmap = new SvpSalBitmap();
pBitmap->Create(Size(nWidth, nHeight), GetBitCount(), BitmapPalette()); BitmapPalette aPal;
if (GetBitCount() == 1)
{
aPal.SetEntryCount(2);
aPal[0] = Color(COL_BLACK);
aPal[1] = Color(COL_WHITE);
}
pBitmap->Create(Size(nWidth, nHeight), GetBitCount(), aPal);
cairo_surface_t* target = SvpSalGraphics::createCairoSurface(pBitmap->GetBuffer()); cairo_surface_t* target = SvpSalGraphics::createCairoSurface(pBitmap->GetBuffer());
cairo_t* cr = cairo_create(target); cairo_t* cr = cairo_create(target);