diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-08 11:25:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-08 12:58:51 +0200 |
| commit | 7707cba0bd3f1d544ead634282f8d3415af0cd5e (patch) | |
| tree | ac931af938a4fad99f8d96c479451b623ea4b037 /include | |
| parent | f7e4a52411255b61e8fcc4172e67c9f86cf25e36 (diff) | |
use BitmapEx in ImpSdrPdfImport::ImportImage
Change-Id: I80e197ffcda4ebc5d50e611b7a4a5c3fd84fc839
Reviewed-on: https://gerrit.libreoffice.org/75201
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/bitmapex.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/dibtools.hxx | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 71da7cb45dc8..478b9fdefea9 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -22,6 +22,7 @@ #include <vcl/dllapi.h> #include <vcl/alpha.hxx> +#include <vcl/Scanline.hxx> #include <tools/color.hxx> #include <sal/types.h> @@ -47,6 +48,7 @@ public: explicit BitmapEx( const OUString& rIconName ); BitmapEx( const BitmapEx& rBitmapEx ); BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ); + BitmapEx( Size aSize, sal_uInt16 nBitCount ); explicit BitmapEx( const Bitmap& rBmp ); BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ); BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ); @@ -467,6 +469,12 @@ public: private: friend class ImpGraphic; friend bool VCL_DLLPUBLIC WriteDIBBitmapEx(const BitmapEx& rSource, SvStream& rOStm); + friend void ReadRawDIB(); + friend bool VCL_DLLPUBLIC ReadRawDIB(BitmapEx& rTarget, const unsigned char* pBuf, + const ScanlineFormat nFormat, + const int nHeight, + const int nStride); + void loadFromIconTheme( const OUString& rIconName ); Bitmap maBitmap; diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx index c5fa662ebb73..6064491f8ec3 100644 --- a/include/vcl/dibtools.hxx +++ b/include/vcl/dibtools.hxx @@ -55,7 +55,7 @@ bool VCL_DLLPUBLIC ReadDIBV5( SvStream& rIStm); bool VCL_DLLPUBLIC ReadRawDIB( - Bitmap& rTarget, + BitmapEx& rTarget, const unsigned char* pBuf, const ScanlineFormat nFormat, const int nHeight, |