Blame SOURCES/0001-Resolves-rhbz-1467512-mask-not-created-as-1-bit-dept.patch

dc0b3e
From 97406f8816b0c10d73f6070e07c8181242dc1596 Mon Sep 17 00:00:00 2001
dc0b3e
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
dc0b3e
Date: Fri, 7 Jul 2017 13:59:27 +0100
dc0b3e
Subject: [PATCH] Resolves: rhbz#1467512 mask not created as 1 bit depth
dc0b3e
MIME-Version: 1.0
dc0b3e
Content-Type: text/plain; charset=UTF-8
dc0b3e
Content-Transfer-Encoding: 8bit
dc0b3e
dc0b3e
Change-Id: Ib5bdd594efd41eb881dfc4e2454b72e4739ffd56
dc0b3e
dc0b3e
Resolves: tdf#104141 CAIRO_FORMAT_A1 vs N1BitLsbPal
dc0b3e
dc0b3e
where vcl transparency is the opposite of cairo's so we've been switching the
dc0b3e
source color to the opposite for drawing on CAIRO_FORMAT_A1 and then sucking
dc0b3e
out the bits "as-is" to give the right results.
dc0b3e
dc0b3e
Now instead use the right source color and toggle CAIRO_FORMAT_A1 bitmaps to
dc0b3e
N1BitLsbPal in getBitmap.
dc0b3e
dc0b3e
Then additionally toggle all N1BitLsbPal bitmaps input to drawBitmap to
dc0b3e
CAIRO_FORMAT_A1 when making a cairo surface from them.
dc0b3e
dc0b3e
Change-Id: I45c6d4f3894c6a22a07a3bd65950cd8070e8eaff
dc0b3e
Reviewed-on: https://gerrit.libreoffice.org/40453
dc0b3e
Tested-by: Jenkins <ci@libreoffice.org>
dc0b3e
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
dc0b3e
Tested-by: Caolán McNamara <caolanm@redhat.com>
dc0b3e
dc0b3e
Resolves: tdf#111483 1 bit bitmaps with non-standard black/white indexes
dc0b3e
dc0b3e
can be left "untoggled" when converted to cairo A1
dc0b3e
dc0b3e
Change-Id: I18f3e2109cd4b57bce584545090e26c931de1200
dc0b3e
Reviewed-on: https://gerrit.libreoffice.org/41895
dc0b3e
Tested-by: Jenkins <ci@libreoffice.org>
dc0b3e
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
dc0b3e
Tested-by: Caolán McNamara <caolanm@redhat.com>
dc0b3e
dc0b3e
Resolves: tdf#111073 incorrect gif background color
dc0b3e
dc0b3e
a) set correct palette entries for the 1bit bitmap returned
dc0b3e
b) only use a BITMASK for the mask (like its AnimatedGraphicPrimitive2D
dc0b3e
brother in drawinglayer does)
dc0b3e
dc0b3e
Change-Id: I704997de554dc4d0e523458d45ab329815b5046a
dc0b3e
---
dc0b3e
 slideshow/source/engine/shapes/gdimtftools.cxx |  2 +-
dc0b3e
 vcl/headless/svpgdi.cxx                        | 76 +++++++++++++++++++-------
dc0b3e
 2 files changed, 56 insertions(+), 22 deletions(-)
dc0b3e
dc0b3e
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
dc0b3e
index 6cd569e..efa4303 100644
dc0b3e
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
dc0b3e
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
dc0b3e
@@ -287,7 +287,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames&   o_rFrames,
dc0b3e
     pVDev->EnableMapMode( false );
dc0b3e
 
dc0b3e
     // setup mask VDev (alpha VDev is currently rather slow)
dc0b3e
-    ScopedVclPtrInstance< VirtualDevice > pVDevMask;
dc0b3e
+    ScopedVclPtrInstance<VirtualDevice> pVDevMask(DeviceFormat::BITMASK);
dc0b3e
     pVDevMask->SetOutputSizePixel( aAnimSize );
dc0b3e
     pVDevMask->EnableMapMode( false );
dc0b3e
 
dc0b3e
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
dc0b3e
index 1b49133..c40aad1 100644
dc0b3e
--- a/vcl/headless/svpgdi.cxx
dc0b3e
+++ b/vcl/headless/svpgdi.cxx
dc0b3e
@@ -99,6 +99,30 @@ bool SvpSalGraphics::blendAlphaBitmap( const SalTwoRect&, const SalBitmap&, cons
dc0b3e
 
dc0b3e
 namespace
dc0b3e
 {
dc0b3e
+    cairo_format_t getCairoFormat(const BitmapBuffer& rBuffer)
dc0b3e
+    {
dc0b3e
+        cairo_format_t nFormat;
dc0b3e
+        assert(rBuffer.mnBitCount == 32 || rBuffer.mnBitCount == 1);
dc0b3e
+        if (rBuffer.mnBitCount == 32)
dc0b3e
+            nFormat = CAIRO_FORMAT_ARGB32;
dc0b3e
+        else
dc0b3e
+            nFormat = CAIRO_FORMAT_A1;
dc0b3e
+        return nFormat;
dc0b3e
+    }
dc0b3e
+
dc0b3e
+    void Toggle1BitTransparency(const BitmapBuffer& rBuf)
dc0b3e
+    {
dc0b3e
+        assert(rBuf.maPalette.GetBestIndex(BitmapColor(Color(COL_BLACK))) == 0);
dc0b3e
+        // TODO: make upper layers use standard alpha
dc0b3e
+        if (getCairoFormat(rBuf) == CAIRO_FORMAT_A1)
dc0b3e
+        {
dc0b3e
+            const int nImageSize = rBuf.mnHeight * rBuf.mnScanlineSize;
dc0b3e
+            unsigned char* pDst = rBuf.mpBits;
dc0b3e
+            for (int i = nImageSize; --i >= 0; ++pDst)
dc0b3e
+                *pDst = ~*pDst;
dc0b3e
+        }
dc0b3e
+    }
dc0b3e
+
dc0b3e
     class SourceHelper
dc0b3e
     {
dc0b3e
     public:
dc0b3e
@@ -176,10 +200,14 @@ namespace
dc0b3e
                 pAlphaBits = new unsigned char[nImageSize];
dc0b3e
                 memcpy(pAlphaBits, pMaskBuf->mpBits, nImageSize);
dc0b3e
 
dc0b3e
-                // TODO: make upper layers use standard alpha
dc0b3e
-                unsigned char* pDst = pAlphaBits;
dc0b3e
-                for (int i = nImageSize; --i >= 0; ++pDst)
dc0b3e
-                    *pDst = ~*pDst;
dc0b3e
+                const sal_Int32 nBlackIndex = pMaskBuf->maPalette.GetBestIndex(BitmapColor(Color(COL_BLACK)));
dc0b3e
+                if (nBlackIndex == 0)
dc0b3e
+                {
dc0b3e
+                    // TODO: make upper layers use standard alpha
dc0b3e
+                    unsigned char* pDst = pAlphaBits;
dc0b3e
+                    for (int i = nImageSize; --i >= 0; ++pDst)
dc0b3e
+                        *pDst = ~*pDst;
dc0b3e
+                }
dc0b3e
 
dc0b3e
                 mask = cairo_image_surface_create_for_data(pAlphaBits,
dc0b3e
                                                 CAIRO_FORMAT_A1,
dc0b3e
@@ -894,7 +922,7 @@ void SvpSalGraphics::applyColor(cairo_t *cr, SalColor aColor)
dc0b3e
     }
dc0b3e
     else
dc0b3e
     {
dc0b3e
-        double fSet = aColor == COL_BLACK ? 0.0 : 1.0;
dc0b3e
+        double fSet = aColor == COL_BLACK ? 1.0 : 0.0;
dc0b3e
         cairo_set_source_rgba(cr, 1, 1, 1, fSet);
dc0b3e
         cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
dc0b3e
     }
dc0b3e
@@ -951,8 +979,12 @@ static basegfx::B2DRange renderSource(cairo_t* cr, const SalTwoRect& rTR,
dc0b3e
     if (rTR.mnSrcWidth != 0 && rTR.mnSrcHeight != 0) {
dc0b3e
         cairo_scale(cr, (double)(rTR.mnDestWidth)/rTR.mnSrcWidth, ((double)rTR.mnDestHeight)/rTR.mnSrcHeight);
dc0b3e
     }
dc0b3e
+
dc0b3e
+    cairo_save(cr);
dc0b3e
     cairo_set_source_surface(cr, source, -rTR.mnSrcX, -rTR.mnSrcY);
dc0b3e
+    cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
dc0b3e
     cairo_paint(cr);
dc0b3e
+    cairo_restore(cr);
dc0b3e
 
dc0b3e
     return extents;
dc0b3e
 }
dc0b3e
@@ -1016,12 +1048,16 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rTR,
dc0b3e
 
dc0b3e
 void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const SalBitmap& rSourceBitmap)
dc0b3e
 {
dc0b3e
-    SourceHelper aSurface(rSourceBitmap);
dc0b3e
-    cairo_surface_t* source = aSurface.getSurface();
dc0b3e
-    if (!source)
dc0b3e
+    if (rSourceBitmap.GetBitCount() == 1)
dc0b3e
     {
dc0b3e
-        SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawBitmap case");
dc0b3e
+        MaskHelper aMask(rSourceBitmap);
dc0b3e
+        cairo_surface_t* source = aMask.getMask();
dc0b3e
+        copySource(rTR, source);
dc0b3e
+        return;
dc0b3e
     }
dc0b3e
+
dc0b3e
+    SourceHelper aSurface(rSourceBitmap);
dc0b3e
+    cairo_surface_t* source = aSurface.getSurface();
dc0b3e
     copySource(rTR, source);
dc0b3e
 }
dc0b3e
 
dc0b3e
@@ -1107,7 +1143,14 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rTR,
dc0b3e
 SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeight )
dc0b3e
 {
dc0b3e
     SvpSalBitmap* pBitmap = new SvpSalBitmap();
dc0b3e
-    pBitmap->Create(Size(nWidth, nHeight), 32, BitmapPalette());
dc0b3e
+    BitmapPalette aPal;
dc0b3e
+    if (GetBitCount() == 1)
dc0b3e
+    {
dc0b3e
+        aPal.SetEntryCount(2);
dc0b3e
+        aPal[0] = Color(COL_BLACK);
dc0b3e
+        aPal[1] = Color(COL_WHITE);
dc0b3e
+    }
dc0b3e
+    pBitmap->Create(Size(nWidth, nHeight), GetBitCount(), aPal);
dc0b3e
 
dc0b3e
     cairo_surface_t* target = SvpSalGraphics::createCairoSurface(pBitmap->GetBuffer());
dc0b3e
     cairo_t* cr = cairo_create(target);
dc0b3e
@@ -1118,6 +1161,8 @@ SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeigh
dc0b3e
     cairo_destroy(cr);
dc0b3e
     cairo_surface_destroy(target);
dc0b3e
 
dc0b3e
+    Toggle1BitTransparency(*pBitmap->GetBuffer());
dc0b3e
+
dc0b3e
     return pBitmap;
dc0b3e
 }
dc0b3e
 
dc0b3e
@@ -1230,17 +1275,6 @@ bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong )
dc0b3e
 
dc0b3e
 namespace
dc0b3e
 {
dc0b3e
-    cairo_format_t getCairoFormat(const BitmapBuffer& rBuffer)
dc0b3e
-    {
dc0b3e
-        cairo_format_t nFormat;
dc0b3e
-        assert(rBuffer.mnBitCount == 32 || rBuffer.mnBitCount == 1);
dc0b3e
-        if (rBuffer.mnBitCount == 32)
dc0b3e
-            nFormat = CAIRO_FORMAT_ARGB32;
dc0b3e
-        else
dc0b3e
-            nFormat = CAIRO_FORMAT_A1;
dc0b3e
-        return nFormat;
dc0b3e
-    }
dc0b3e
-
dc0b3e
     bool isCairoCompatible(const BitmapBuffer* pBuffer)
dc0b3e
     {
dc0b3e
         if (!pBuffer)
dc0b3e
-- 
dc0b3e
2.9.4
dc0b3e