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 /vcl/source/bitmap/BitmapTools.cxx | |
| 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 'vcl/source/bitmap/BitmapTools.cxx')
| -rw-r--r-- | vcl/source/bitmap/BitmapTools.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx index c21d5fd2a369..eab36e467ac5 100644 --- a/vcl/source/bitmap/BitmapTools.cxx +++ b/vcl/source/bitmap/BitmapTools.cxx @@ -176,7 +176,7 @@ BitmapEx CreateFromData( sal_uInt8 const *pData, sal_Int32 nWidth, sal_Int32 nHe if (nBitCount == 32) return BitmapEx(aBmp, *pAlphaMask); else - return aBmp; + return BitmapEx(aBmp); } /** Copy block of image data into the bitmap. @@ -227,7 +227,7 @@ BitmapEx CreateFromData( RawBitmap&& rawBitmap ) if (nBitCount == 32) return BitmapEx(aBmp, *pAlphaMask); else - return aBmp; + return BitmapEx(aBmp); } #if ENABLE_CAIRO_CANVAS |