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 /sd | |
| parent | f4932d61e52d595156af1f63e9fb4bed18b63254 (diff) | |
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 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index f811f70960ae..a158b625202e 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -162,7 +162,7 @@ public: std::shared_ptr<BitmapReplacement> PngCompression::Compress (const Bitmap& rBitmap) const { - vcl::PNGWriter aWriter (rBitmap); + vcl::PNGWriter aWriter ((BitmapEx(rBitmap))); SvMemoryStream aStream (32768, 32768); aWriter.Write(aStream); diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index e93e9d101b0f..8c8988e5224a 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -183,7 +183,7 @@ Point InsertionIndicatorOverlay::PaintRepresentatives ( aPageOffset.AdjustY(gnShadowBorder ); // Paint the preview. - Bitmap aPreview (rRepresentatives[nIndex].maBitmap); + BitmapEx aPreview (rRepresentatives[nIndex].maBitmap); aPreview.Scale(rPreviewSize, BmpScaleFlag::BestQuality); rContent.DrawBitmapEx(aPageOffset, aPreview); |