From 62ea0ef8428ca4e12c5fa11674737a9bf0b646aa Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 19 Jan 2016 16:36:38 +0000
Subject: replace use of basebmp in vcl entirely now

we're just using it to store bitmap data and to convert to
preferred destination format, so we can use the preexisting
vcl BitmapBuffer for that

Change-Id: I0e800956d95faddfafa53d2c48b09494a7a867c0
---
 vcl/inc/headless/svpbmp.hxx  | 16 +++++++---------
 vcl/inc/headless/svpgdi.hxx  |  8 ++++----
 vcl/inc/headless/svpinst.hxx |  4 ----
 3 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'vcl/inc/headless')

diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index 757f6d52e03a..85c4e13c5a5a 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -23,20 +23,15 @@
 #include "sal/config.h"
 #include "tools/solar.h"
 
-#include "basebmp/bitmapdevice.hxx"
-
 #include <salbmp.hxx>
 
 class VCL_DLLPUBLIC SvpSalBitmap : public SalBitmap
 {
-    basebmp::BitmapDeviceSharedPtr     m_aBitmap;
+    BitmapBuffer*   mpDIB;
 public:
-    SvpSalBitmap() {}
+    SvpSalBitmap() : mpDIB(nullptr) {}
     virtual ~SvpSalBitmap();
 
-    const basebmp::BitmapDeviceSharedPtr& getBitmap() const { return m_aBitmap; }
-    void setBitmap( const basebmp::BitmapDeviceSharedPtr& rSrc ) { m_aBitmap = rSrc; }
-
     // SalBitmap
     virtual bool            Create( const Size& rSize,
                                     sal_uInt16 nBitCount,
@@ -49,6 +44,11 @@ public:
     virtual bool            Create( const css::uno::Reference< css::rendering::XBitmapCanvas >& rBitmapCanvas,
                                     Size& rSize,
                                     bool bMask = false ) override;
+    bool                    Create(BitmapBuffer *pBuf);
+    const BitmapBuffer*     GetBuffer() const
+    {
+        return mpDIB;
+    }
     virtual void            Destroy() override;
     virtual Size            GetSize() const override;
     virtual sal_uInt16      GetBitCount() const override;
@@ -59,8 +59,6 @@ public:
 
     virtual bool            Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) override;
     virtual bool            Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) override;
-
-    static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat );
 };
 
 #endif // INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 1cece1a7b8d8..1dfba8901588 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 #define INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
 
-#include <basebmp/bitmapdevice.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/metric.hxx>
 #include <config_cairo_canvas.h>
@@ -39,11 +38,12 @@
 //cairo then matches the OpenGL GL_RGBA format so we can use it there
 //where we don't have GL_BGRA support.
 #ifdef ANDROID
-#   define SVP_CAIRO_FORMAT basebmp::Format::ThirtyTwoBitTcMaskRGBA
+#   define SVP_CAIRO_FORMAT (BMP_FORMAT_32BIT_TC_RGBA | BMP_FORMAT_TOP_DOWN)
 #else
-#   define SVP_CAIRO_FORMAT basebmp::Format::ThirtyTwoBitTcMaskBGRA
+#   define SVP_CAIRO_FORMAT (BMP_FORMAT_32BIT_TC_BGRA | BMP_FORMAT_TOP_DOWN)
 #endif
 
+class BitmapBuffer;
 class GlyphCache;
 class ServerFont;
 typedef struct _cairo cairo_t;
@@ -219,7 +219,7 @@ public:
 
     cairo_t*                getCairoContext(bool bXorModeAllowed) const;
     void                    releaseCairoContext(cairo_t* cr, bool bXorModeAllowed, const cairo_rectangle_int_t& extents) const;
-    static cairo_surface_t* createCairoSurface(const basebmp::BitmapDeviceSharedPtr &rBuffer);
+    static cairo_surface_t* createCairoSurface(const BitmapBuffer *pBuffer);
     void                    clipRegion(cairo_t* cr);
 };
 
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index ecf68d48654b..417afd8f51de 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -27,7 +27,6 @@
 #include <saltimer.hxx>
 #include <unx/geninst.h>
 #include <unx/genprn.h>
-#include <basebmp/scanlineformats.hxx>
 
 #include <list>
 
@@ -166,9 +165,6 @@ public:
     virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) override;
 
     virtual GenPspGraphics *CreatePrintGraphics() override;
-
-    static ::basebmp::Format getBaseBmpFormatForBitCount(sal_uInt16);
-    static ::basebmp::Format getBaseBmpFormatForDeviceFormat(DeviceFormat);
 };
 
 #endif // INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
-- 
cgit v1.2.3