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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/flash/swfwriter1.cxx | 8 | ||||
| -rw-r--r-- | filter/source/graphicfilter/etiff/etiff.cxx | 2 | ||||
| -rw-r--r-- | filter/source/svg/svgwriter.cxx | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 57923f8dbd13..d1634cce17ff 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -1512,7 +1512,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) { bFound = true; const MetaBmpScaleAction* pBmpScaleAction = static_cast<const MetaBmpScaleAction*>(pSubstAct); - Impl_writeImage( pBmpScaleAction->GetBitmap(), + Impl_writeImage( BitmapEx(pBmpScaleAction->GetBitmap()), pA->GetPoint(), pA->GetSize(), Point(), pBmpScaleAction->GetBitmap().GetSizePixel(), clipRect, 1 == bMap ); } @@ -1613,7 +1613,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) { const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); - Impl_writeImage( pA->GetBitmap(), + Impl_writeImage( BitmapEx(pA->GetBitmap()), pA->GetPoint(), pA->GetSize(), Point(), pA->GetBitmap().GetSizePixel(), clipRect, 1 == bMap ); } @@ -1622,7 +1622,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) case MetaActionType::BMP: { const MetaBmpAction* pA = static_cast<const MetaBmpAction*>(pAction); - Impl_writeImage( pA->GetBitmap(), + Impl_writeImage( BitmapEx(pA->GetBitmap()), pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmap().GetSizePixel()), Point(), pA->GetBitmap().GetSizePixel(), clipRect, 1 ==bMap ); } @@ -1631,7 +1631,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) case MetaActionType::BMPSCALEPART: { const MetaBmpScalePartAction* pA = static_cast<const MetaBmpScalePartAction*>(pAction); - Impl_writeImage( pA->GetBitmap(), + Impl_writeImage( BitmapEx(pA->GetBitmap()), pA->GetDestPoint(), pA->GetDestSize(), pA->GetSrcPoint(), pA->GetSrcSize(), clipRect, 1 == bMap ); } diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 9663cb669abc..17b99eefd52b 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -168,7 +168,7 @@ bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem const * pF { Animation aAnimation = rGraphic.IsAnimated() ? rGraphic.GetAnimation() : Animation(); if (!rGraphic.IsAnimated()) - aAnimation.Insert(AnimationBitmap(rGraphic.GetBitmap(), Point(), Size())); + aAnimation.Insert(AnimationBitmap(rGraphic.GetBitmapEx(), Point(), Size())); for (size_t i = 0; i < aAnimation.Count(); ++i) mnSumOfAllPictHeight += aAnimation.Get(i).aBmpEx.GetSizePixel().Height(); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index b414cc573f46..9cbe2b24e3ee 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -3066,7 +3066,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, { bFound = true; const MetaBmpScaleAction* pBmpScaleAction = static_cast<const MetaBmpScaleAction*>(pSubstAct); - ImplWriteBmp( pBmpScaleAction->GetBitmap(), + ImplWriteBmp( BitmapEx(pBmpScaleAction->GetBitmap()), pA->GetPoint(), pA->GetSize(), Point(), pBmpScaleAction->GetBitmap().GetSizePixel() ); } @@ -3448,7 +3448,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, { const MetaBmpAction* pA = static_cast<const MetaBmpAction*>(pAction); - ImplWriteBmp( pA->GetBitmap(), + ImplWriteBmp( BitmapEx(pA->GetBitmap()), pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmap().GetSizePixel() ), Point(), pA->GetBitmap().GetSizePixel() ); } @@ -3468,7 +3468,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, } else { - ImplWriteBmp( pA->GetBitmap(), + ImplWriteBmp( BitmapEx(pA->GetBitmap()), pA->GetPoint(), pA->GetSize(), Point(), pA->GetBitmap().GetSizePixel() ); } @@ -3482,7 +3482,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, { const MetaBmpScalePartAction* pA = static_cast<const MetaBmpScalePartAction*>(pAction); - ImplWriteBmp( pA->GetBitmap(), + ImplWriteBmp( BitmapEx(pA->GetBitmap()), pA->GetDestPoint(), pA->GetDestSize(), pA->GetSrcPoint(), pA->GetSrcSize() ); } |