diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-23 13:19:29 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-23 13:59:25 +0100 |
| commit | a4fc2b364f47d3e8ada841381283dd49bfe9d5a0 (patch) | |
| tree | d37fe0c706c88b91dfe9401e2933edcc21ab8d1c /include | |
| parent | 49b0711dade7a926ba03309d376133be3f60bbf0 (diff) | |
vcl: simplify Image internals
Image could be of 2 types - BITMAP or IMAGE, where BITMAP used to
store the content in a Bitmap and IMAGE in a ImplImageData, which
contained a BitmapEx. This was refactored with this commit to
always store the content in a BitmapEx and there are no distinct
image types anymore. This greatly simplfies the code.
Drawing of the image in case of type IMAGE was done in the class
ImplImageBmp which also modified the image according to
DrawImageFlags (for example to create a "disabled" image). This
was moved to ImplImage and the bitmap manipulation code was moved
to BitmapProcessor (done in previous commits).
Change-Id: Iec9f63a7c05618c457d8465f1ec60ed4f16bd579
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/image.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index 696e7cddbc13..e5c045feeccf 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -25,6 +25,8 @@ #include <tools/resid.hxx> #include <tools/solar.h> #include <vcl/bitmapex.hxx> +#include <vcl/outdev.hxx> + #include <com/sun/star/uno/Reference.hxx> #include <vector> @@ -71,6 +73,8 @@ public: bool operator==( const Image& rImage ) const; bool operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); } + void Draw(OutputDevice* pOutDev, const Point& rPos, DrawImageFlags nStyle, const Size* pSize = nullptr); + private: ImplImage* mpImplData; |