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 /emfio | |
| 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 'emfio')
| -rw-r--r-- | emfio/source/reader/mtftools.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index e231cf00ef04..89ca286a9501 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -1756,7 +1756,7 @@ namespace emfio else { SetRasterOp( WMFRasterOp::XorPen ); - ImplDrawBitmap( aPos, aSize, aBitmap ); + ImplDrawBitmap( aPos, aSize, BitmapEx(aBitmap) ); SetRasterOp( WMFRasterOp::CopyPen ); Bitmap aMask( aBitmap ); aMask.Invert(); @@ -1800,7 +1800,7 @@ namespace emfio BitmapEx aBmpEx( aBitmap, aMask ); ImplDrawBitmap( aPos, aSize, aBmpEx ); SetRasterOp( WMFRasterOp::XorPen ); - ImplDrawBitmap( aPos, aSize, aBitmap ); + ImplDrawBitmap( aPos, aSize, BitmapEx(aBitmap) ); if ( nOperation == 0xb ) { SetRasterOp( WMFRasterOp::Not ); @@ -1817,7 +1817,7 @@ namespace emfio BitmapEx aBmpEx( aBitmap, aMask ); ImplDrawBitmap( aPos, aSize, aBmpEx ); SetRasterOp( WMFRasterOp::XorPen ); - ImplDrawBitmap( aPos, aSize, aBitmap ); + ImplDrawBitmap( aPos, aSize, BitmapEx(aBitmap) ); if ( nOperation == 0xd ) { SetRasterOp( WMFRasterOp::Not ); @@ -1829,7 +1829,7 @@ namespace emfio case 0x9 : { SetRasterOp( WMFRasterOp::XorPen ); - ImplDrawBitmap( aPos, aSize, aBitmap ); + ImplDrawBitmap( aPos, aSize, BitmapEx(aBitmap) ); if ( nOperation == 0x9 ) { SetRasterOp( WMFRasterOp::Not ); @@ -1852,7 +1852,7 @@ namespace emfio { if ( nRasterOperation == 0x33 ) aBitmap.Invert(); - ImplDrawBitmap( aPos, aSize, aBitmap ); + ImplDrawBitmap( aPos, aSize, BitmapEx(aBitmap) ); } break; |