diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-01 10:05:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-01 20:12:18 +0200 |
| commit | c96d58cca2503fd257c3c742188af66075e194de (patch) | |
| tree | da6b75a8fdce10b6e7da23105ae09aac69e02c88 /include | |
| parent | d098fb74df7c11bbfa8103ec8c7c89652b07bfc4 (diff) | |
use more BitmapEx in filter
Change-Id: I68fdad6a69a178df8c59c4272f1d8d0b2f101315
Reviewed-on: https://gerrit.libreoffice.org/55163
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/mstoolbar.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/alpha.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/dibtools.hxx | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index 6b2f923247dd..5a7da86b37b5 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -19,7 +19,7 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <tools/stream.hxx> -#include <vcl/bitmap.hxx> +#include <vcl/bitmapex.hxx> namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } @@ -156,7 +156,7 @@ class MSFILTER_DLLPUBLIC TBCBitMap : public TBBase { friend class TBCBSpecific; // #FIXME hacky access, need to fix sal_Int32 cbDIB; - Bitmap mBitMap; + BitmapEx mBitMap; public: TBCBitMap(); virtual ~TBCBitMap() override; @@ -165,7 +165,7 @@ public: virtual void Print( FILE* ) override; #endif // #FIXME Const-ness - Bitmap& getBitMap() { return mBitMap;} + BitmapEx& getBitMap() { return mBitMap;} }; class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index a36e4b6b0bfd..e91845c638a8 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -72,7 +72,7 @@ public: private: friend class BitmapEx; friend class ::OutputDevice; - friend bool VCL_DLLPUBLIC ReadDIBBitmapEx(BitmapEx& rTarget, SvStream& rIStm); + friend bool VCL_DLLPUBLIC ReadDIBBitmapEx(BitmapEx& rTarget, SvStream& rIStm, bool bFileHeader, bool bMSOFormat); SAL_DLLPRIVATE const Bitmap& ImplGetBitmap() const; SAL_DLLPRIVATE void ImplSetBitmap( const Bitmap& rBitmap ); diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx index 65d6b26f2340..dca6730c88b6 100644 --- a/include/vcl/dibtools.hxx +++ b/include/vcl/dibtools.hxx @@ -46,7 +46,9 @@ bool VCL_DLLPUBLIC ReadDIB( // ReadDIB(rBitmap, rIStm, true); bool VCL_DLLPUBLIC ReadDIBBitmapEx( BitmapEx& rTarget, - SvStream& rIStm); + SvStream& rIStm, + bool bFileHeader = true, + bool bMSOFormat = false); bool VCL_DLLPUBLIC ReadDIBV5( Bitmap& rTarget, |