diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-10 12:37:56 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-10 16:23:59 +0200 |
commit | 40110d917b26f0d0e84938df2792abfedb461c45 (patch) | |
tree | 824313be0bc660c290b610921932b4c33f2e3321 /canvas | |
parent | 8d831cc01daaed6937fc126dc5671ae58e8c027e (diff) |
No more need for extra local variables
...after 453fde35bb838febf73bfda0bd981ee270c9b12e "BitmapFilter::execute can be
const". This reverts the call-site changes of
bce47223099bb3349d96af9d6b1fe88bcdd539df "clang-tidy bugprone-use-after-move in
BitmapFilter::Filter" again.
Change-Id: I5ce4eb7ddce90fb779ddfb1c5864fd4785708175
Reviewed-on: https://gerrit.libreoffice.org/60255
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 3 | ||||
-rw-r--r-- | canvas/source/vcl/spritehelper.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index c89a216ce092..cdbf15cd6b88 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -720,8 +720,7 @@ namespace vclcanvas // transparency is fully transparent if( aBmpEx.IsAlpha() ) { - BitmapAlphaClampFilter filter(253); - BitmapFilter::Filter(aBmpEx, filter); + BitmapFilter::Filter(aBmpEx, BitmapAlphaClampFilter(253)); } mp2ndOutDevProvider->getOutDev().DrawBitmapEx( vcl::unotools::pointFromB2DPoint( aOutputPos ), diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 1a1bc30f585f..123a6b64b2e4 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -158,8 +158,7 @@ namespace vclcanvas OSL_FAIL("CanvasCustomSprite::redraw(): Mask bitmap is not " "monochrome (performance!)"); BitmapEx aMaskEx(aMask); - BitmapMonochromeFilter filter(255); - BitmapFilter::Filter(aMaskEx, filter); + BitmapFilter::Filter(aMaskEx, BitmapMonochromeFilter(255)); aMask = aMaskEx.GetBitmap(); } #endif |