From dd16d34a6ebfbe60cee1d01752f167069ddb2848 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 19 Jan 2016 12:42:58 +0000 Subject: either copy the whole thing exactly, or convert between types Change-Id: Ied1b4f81e2e851b639cc9a514659160b8571e92f --- include/basebmp/bitmapdevice.hxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx index 1ad089d1d6bd..aa1cc6a2ff2b 100644 --- a/include/basebmp/bitmapdevice.hxx +++ b/include/basebmp/bitmapdevice.hxx @@ -102,7 +102,7 @@ public: @param rSrcBitmap Bitmap to render into this one. */ - void copyBitmap( const BitmapDeviceSharedPtr& rSrcBitmap ); + void convertBitmap( const BitmapDeviceSharedPtr& rSrcBitmap ); protected: BASEBMP_DLLPRIVATE BitmapDevice( const basegfx::B2IBox& rBounds, @@ -116,13 +116,10 @@ protected: BitmapDevice& operator=( const BitmapDevice& ) = delete; private: - BASEBMP_DLLPRIVATE virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const = 0; BASEBMP_DLLPRIVATE virtual Color getPixel_i( const basegfx::B2IPoint& rPt ) = 0; - BASEBMP_DLLPRIVATE virtual void copyBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap ) = 0; - - BitmapDeviceSharedPtr getGenericRenderer() const; + BASEBMP_DLLPRIVATE virtual void convertBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap ) = 0; std::unique_ptr< ImplBitmapDevice > mpImpl; }; -- cgit