[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - slideshow/source vcl/headless
Caolán McNamara
caolanm at redhat.com
Fri Sep 15 19:08:05 UTC 2017
slideshow/source/engine/shapes/gdimtftools.cxx | 2
vcl/headless/svpgdi.cxx | 76 ++++++++++++++++++-------
2 files changed, 56 insertions(+), 22 deletions(-)
New commits:
commit 06530418dbb3ac41d671efed87d54434d19f0569
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 7 13:59:27 2017 +0100
Resolves: tdf#104141 CAIRO_FORMAT_A1 vs N1BitLsbPal
where vcl transparency is the opposite of cairo's so we've been switching the
source color to the opposite for drawing on CAIRO_FORMAT_A1 and then sucking
out the bits "as-is" to give the right results.
Now instead use the right source color and toggle CAIRO_FORMAT_A1 bitmaps to
N1BitLsbPal in getBitmap.
Then additionally toggle all N1BitLsbPal bitmaps input to drawBitmap to
CAIRO_FORMAT_A1 when making a cairo surface from them.
Change-Id: I45c6d4f3894c6a22a07a3bd65950cd8070e8eaff
Reviewed-on: https://gerrit.libreoffice.org/40453
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit d148340babf6c973f7d463909d7a51e16c953248)
Resolves: tdf#111483 1 bit bitmaps with non-standard black/white indexes
can be left "untoggled" when converted to cairo A1
Reviewed-on: https://gerrit.libreoffice.org/41895
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 3cb59bff332b02f607d15b5ed41b4438e8102980)
Change-Id: I18f3e2109cd4b57bce584545090e26c931de1200
Resolves: tdf#111073 incorrect gif background color
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
Resolves: rhbz#1467512 mask not created as 1 bit depth
Change-Id: Ib5bdd594efd41eb881dfc4e2454b72e4739ffd56
Reviewed-on: https://gerrit.libreoffice.org/39693
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit bea1dc5f8d17c1011cdfab1ff540f3e4b3a4d1bb)
Reviewed-on: https://gerrit.libreoffice.org/41924
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 5cdd8d0095ed..060bb89e7ce2 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -285,7 +285,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames,
pVDev->EnableMapMode( false );
// setup mask VDev (alpha VDev is currently rather slow)
- ScopedVclPtrInstance< VirtualDevice > pVDevMask;
+ ScopedVclPtrInstance<VirtualDevice> pVDevMask(DeviceFormat::BITMASK);
pVDevMask->SetOutputSizePixel( aAnimSize );
pVDevMask->EnableMapMode( false );
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 52326084126b..538aba38d017 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -100,6 +100,30 @@ bool SvpSalGraphics::blendAlphaBitmap( const SalTwoRect&, const SalBitmap&, cons
namespace
{
+ cairo_format_t getCairoFormat(const BitmapBuffer& rBuffer)
+ {
+ cairo_format_t nFormat;
+ assert(rBuffer.mnBitCount == 32 || rBuffer.mnBitCount == 1);
+ if (rBuffer.mnBitCount == 32)
+ nFormat = CAIRO_FORMAT_ARGB32;
+ else
+ nFormat = CAIRO_FORMAT_A1;
+ return nFormat;
+ }
+
+ void Toggle1BitTransparency(const BitmapBuffer& rBuf)
+ {
+ assert(rBuf.maPalette.GetBestIndex(BitmapColor(Color(COL_BLACK))) == 0);
+ // TODO: make upper layers use standard alpha
+ if (getCairoFormat(rBuf) == CAIRO_FORMAT_A1)
+ {
+ const int nImageSize = rBuf.mnHeight * rBuf.mnScanlineSize;
+ unsigned char* pDst = rBuf.mpBits;
+ for (int i = nImageSize; --i >= 0; ++pDst)
+ *pDst = ~*pDst;
+ }
+ }
+
class SourceHelper
{
public:
@@ -193,10 +217,14 @@ namespace
pAlphaBits = new unsigned char[nImageSize];
memcpy(pAlphaBits, pMaskBuf->mpBits, nImageSize);
- // TODO: make upper layers use standard alpha
- unsigned char* pDst = pAlphaBits;
- for (int i = nImageSize; --i >= 0; ++pDst)
- *pDst = ~*pDst;
+ const sal_Int32 nBlackIndex = pMaskBuf->maPalette.GetBestIndex(BitmapColor(Color(COL_BLACK)));
+ if (nBlackIndex == 0)
+ {
+ // TODO: make upper layers use standard alpha
+ unsigned char* pDst = pAlphaBits;
+ for (int i = nImageSize; --i >= 0; ++pDst)
+ *pDst = ~*pDst;
+ }
mask = cairo_image_surface_create_for_data(pAlphaBits,
CAIRO_FORMAT_A1,
@@ -912,7 +940,7 @@ void SvpSalGraphics::applyColor(cairo_t *cr, SalColor aColor)
}
else
{
- double fSet = aColor == COL_BLACK ? 0.0 : 1.0;
+ double fSet = aColor == COL_BLACK ? 1.0 : 0.0;
cairo_set_source_rgba(cr, 1, 1, 1, fSet);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
}
@@ -969,8 +997,12 @@ static basegfx::B2DRange renderSource(cairo_t* cr, const SalTwoRect& rTR,
if (rTR.mnSrcWidth != 0 && rTR.mnSrcHeight != 0) {
cairo_scale(cr, (double)(rTR.mnDestWidth)/rTR.mnSrcWidth, ((double)rTR.mnDestHeight)/rTR.mnSrcHeight);
}
+
+ cairo_save(cr);
cairo_set_source_surface(cr, source, -rTR.mnSrcX, -rTR.mnSrcY);
+ cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_paint(cr);
+ cairo_restore(cr);
return extents;
}
@@ -1027,12 +1059,16 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rTR,
void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const SalBitmap& rSourceBitmap)
{
- SourceHelper aSurface(rSourceBitmap);
- cairo_surface_t* source = aSurface.getSurface();
- if (!source)
+ if (rSourceBitmap.GetBitCount() == 1)
{
- SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawBitmap case");
+ MaskHelper aMask(rSourceBitmap);
+ cairo_surface_t* source = aMask.getMask();
+ copySource(rTR, source);
+ return;
}
+
+ SourceHelper aSurface(rSourceBitmap);
+ cairo_surface_t* source = aSurface.getSurface();
copySource(rTR, source);
}
@@ -1110,7 +1146,14 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rTR,
SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight )
{
SvpSalBitmap* pBitmap = new SvpSalBitmap();
- pBitmap->Create(Size(nWidth, nHeight), 32, 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_t* cr = cairo_create(target);
@@ -1121,6 +1164,8 @@ SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeigh
cairo_destroy(cr);
cairo_surface_destroy(target);
+ Toggle1BitTransparency(*pBitmap->GetBuffer());
+
return pBitmap;
}
@@ -1256,17 +1301,6 @@ bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
namespace
{
- cairo_format_t getCairoFormat(const BitmapBuffer& rBuffer)
- {
- cairo_format_t nFormat;
- assert(rBuffer.mnBitCount == 32 || rBuffer.mnBitCount == 1);
- if (rBuffer.mnBitCount == 32)
- nFormat = CAIRO_FORMAT_ARGB32;
- else
- nFormat = CAIRO_FORMAT_A1;
- return nFormat;
- }
-
bool isCairoCompatible(const BitmapBuffer* pBuffer)
{
if (!pBuffer)
More information about the Libreoffice-commits
mailing list