[Libreoffice-commits] core.git: vcl/headless vcl/inc

[Noel Grandin]

 vcl/headless/svpgdi.cxx     |    6 ++++++
 vcl/inc/headless/svpgdi.hxx |    2 ++
 2 files changed, 8 insertions(+)

New commits:
commit e99b6a91d0800acee41ae3b5cbf81be545d93122
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Jun 12 12:03:08 2018 +0200

    revert part of "loplugin:unusedmethods"
    
    revert part of
        commit d4d037619638e1915d15dba81c38a1c9b3157972
        loplugin:unusedmethods
    SvpSalGraphics::drawBitmap is used by KDE5 code
    
    Change-Id: I2a935aa88d7301c35f3fedec13a9785c497b8eb0
    Reviewed-on: https://gerrit.libreoffice.org/55673
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 649d5850350f..4b5050420e7a 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1224,6 +1224,12 @@ void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const SalBitmap& rSourceB
     copySource(rTR, source);
 }
 
+void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, BitmapBuffer* pBuffer)
+{
+    cairo_surface_t* source = createCairoSurface( pBuffer );
+    copySource(rTR, source);
+}
+
 void SvpSalGraphics::drawBitmap( const SalTwoRect& rTR,
                                  const SalBitmap& rSourceBitmap,
                                  const SalBitmap& rTransparentBitmap )
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index ab5762a5409c..c77e5dae4612 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -224,6 +224,8 @@ public:
                                       SalGraphics* pSrcGraphics ) override;
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap ) override;
+    void                    drawBitmap( const SalTwoRect& rPosAry,
+                                        BitmapBuffer* pBuffer );
     virtual void            drawBitmap( const SalTwoRect& rPosAry,
                                         const SalBitmap& rSalBitmap,
                                         const SalBitmap& rTransparentBitmap ) override;