diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-12 16:08:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-12 19:00:00 +0200 |
| commit | 203e3099c17bf245f8fcd52c32c58d47bd241c2b (patch) | |
| tree | 805b01deb02d3bc88582fb4812b4d94c94e65d03 /drawinglayer | |
| parent | make AlphaMask constructors explicit (diff) | |
| download | core-203e3099c17bf245f8fcd52c32c58d47bd241c2b.tar.gz core-203e3099c17bf245f8fcd52c32c58d47bd241c2b.zip | |
make Bitmap/BitmapEx constructors explicit
and add
BitmapEx::operator=(Bitmap const &)
Image::Image(Bitmap const &)
to lessen the fallout
Change-Id: Iff5fab88d167a7be739c370c9933d36c297bc61c
Reviewed-on: https://gerrit.libreoffice.org/54162
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/tools/converters.cxx | 6 | ||||
| -rw-r--r-- | drawinglayer/source/tools/wmfemfhelper.cxx | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx index 64810162305e..968b67bef4c0 100644 --- a/drawinglayer/source/tools/converters.cxx +++ b/drawinglayer/source/tools/converters.cxx @@ -100,7 +100,8 @@ namespace drawinglayer if(bDoSaveForVisualControl) { SvFileStream aNew("c:\\test_content.png", StreamMode::WRITE|StreamMode::TRUNC); - vcl::PNGWriter aPNGWriter(aContent); + BitmapEx aContentEx = BitmapEx(aContent); + vcl::PNGWriter aPNGWriter(aContentEx); aPNGWriter.Write(aNew); } #endif @@ -130,7 +131,8 @@ namespace drawinglayer if(bDoSaveForVisualControl) { SvFileStream aNew("c:\\test_alpha.png", StreamMode::WRITE|StreamMode::TRUNC); - vcl::PNGWriter aPNGWriter(aAlpha); + BitmapEx aAlphaEx = BitmapEx(aAlpha); + vcl::PNGWriter aPNGWriter(aAlphaEx); aPNGWriter.Write(aNew); } #endif diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index 9f1d84c0aca8..2cd0d2d230fd 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -2001,7 +2001,7 @@ namespace wmfemfhelper { /** CHECKED, WORKS WELL */ const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); - const Bitmap aBitmapEx(pA->GetBitmap()); + const BitmapEx aBitmapEx(pA->GetBitmap()); createBitmapExPrimitive(aBitmapEx, pA->GetPoint(), pA->GetSize(), rTargetHolders.Current(), rPropertyHolders.Current()); |