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

tdf#115297: 1bit images displaying fixed (again)

Browse Source 
Previous fix 25cd843664 like any
other before it have some regressions, so reverted.

The root of most problems: fix for tdf#104141
d148340bab, where mask drawing
was implemented in bitmap drawing code.

So instead of guessing for type of bitmap, mask is drawn with
DrawBitmapEx resolving all known problems (tdf#114726, tdf#115297,
tdf#113918 and tdf#104141).

Change-Id: Ie00f7552d667e237b3c0f9505ee09cb51e85c43c
Reviewed-on: https://gerrit.libreoffice.org/50828
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Vasily Melenchuk
2018-03-06 16:23:40 +03:00
committed by Noel Grandin
parent 1008cd6b0a
commit ae11dec720
2 changed files with 4 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
View File

@@ -271,7 +271,8 @@ namespace drawinglayer
} }
else else
{ {
maVirtualDeviceMask->DrawBitmap(rAnimBitmap.aPosPix, aMask); BitmapEx aExpandVisibilityMask = BitmapEx(aMask, aMask);
maVirtualDeviceMask->DrawBitmapEx(rAnimBitmap.aPosPix, aExpandVisibilityMask);
} }
break; break;
@@ -279,7 +280,8 @@ namespace drawinglayer
case Disposal::Previous: case Disposal::Previous:
{ {
maVirtualDevice->DrawBitmapEx(rAnimBitmap.aPosPix, rAnimBitmap.aBmpEx); maVirtualDevice->DrawBitmapEx(rAnimBitmap.aPosPix, rAnimBitmap.aBmpEx);
maVirtualDeviceMask->DrawBitmap(rAnimBitmap.aPosPix, rAnimBitmap.aBmpEx.GetMask()); BitmapEx aExpandVisibilityMask = BitmapEx(rAnimBitmap.aBmpEx.GetMask(), rAnimBitmap.aBmpEx.GetMask());
maVirtualDeviceMask->DrawBitmapEx(rAnimBitmap.aPosPix, aExpandVisibilityMask);
break; break;
} }
} }

31
vcl/headless/svpgdi.cxx
View File

@@ -1200,39 +1200,8 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rTR,
cairo_surface_destroy(pCopy); cairo_surface_destroy(pCopy);
} }
namespace
{
bool isBlackWhite(const SalBitmap& rBitmap)
{
const SvpSalBitmap& rSrcBmp = static_cast<const SvpSalBitmap&>(rBitmap);
const BitmapBuffer * pSourceBuffer = rSrcBmp.GetBuffer();
const BitmapPalette & rPalette = pSourceBuffer->maPalette;
return (
rPalette.GetEntryCount() < 2 ||
(rPalette.GetEntryCount() == 2 &&
rPalette[0] == COL_BLACK &&
rPalette[1] == COL_WHITE ) ||
(rPalette.GetEntryCount() == 2 &&
rPalette[1] == COL_BLACK &&
rPalette[0] == COL_WHITE )
);
}
}
void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const SalBitmap& rSourceBitmap) void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const SalBitmap& rSourceBitmap)
{ {
if (rSourceBitmap.GetBitCount() == 1 && isBlackWhite(rSourceBitmap))
{
// This way we draw only monochrome b/w bitmaps
MaskHelper aMask(rSourceBitmap);
cairo_surface_t* source = aMask.getMask();
copySource(rTR, source);
return;
}
SourceHelper aSurface(rSourceBitmap); SourceHelper aSurface(rSourceBitmap);
cairo_surface_t* source = aSurface.getSurface(); cairo_surface_t* source = aSurface.getSurface();
copySource(rTR, source); copySource(rTR, source);