diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-25 09:11:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-25 09:59:43 +0000 |
| commit | edc87278036107dc392253bdcb99dce54a1d0a41 (patch) | |
| tree | f917dce3ef48baf95af92a3fcaf11dcb5ef8e1cb /vcl | |
| parent | 2af018e4dd99fccdc85a28b38ff924fb16a750cf (diff) | |
Convert Disposal to scoped enum
and drop unused FULL value
Change-Id: I3b9c26cb164785ef86f1a8d57cce962b015c85d6
Reviewed-on: https://gerrit.libreoffice.org/25432
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/igif/gifread.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/gdi/animate.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/impanmvw.cxx | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index 4edb05666ed2..aac672f22271 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -643,11 +643,11 @@ void GIFReader::CreateNewBitmaps() aAnimBmp.bUserInput = false; if( nGCDisposalMethod == 2 ) - aAnimBmp.eDisposal = DISPOSE_BACK; + aAnimBmp.eDisposal = Disposal::Back; else if( nGCDisposalMethod == 3 ) - aAnimBmp.eDisposal = DISPOSE_PREVIOUS; + aAnimBmp.eDisposal = Disposal::Previous; else - aAnimBmp.eDisposal = DISPOSE_NOT; + aAnimBmp.eDisposal = Disposal::Not; aAnimation.Insert( aAnimBmp ); diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index a6eb4300334e..67d9b7dda9ea 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -177,7 +177,7 @@ bool Animation::IsTransparent() const // graphics due to performance reasons. for(const AnimationBitmap* pAnimBmp : maList) { - if( DISPOSE_BACK == pAnimBmp->eDisposal + if( Disposal::Back == pAnimBmp->eDisposal && Rectangle( pAnimBmp->aPosPix, pAnimBmp->aSizePix ) != aRect ) { @@ -713,7 +713,7 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation ) WritePair( rOStm, rAnimBmp.aSizePix ); WritePair( rOStm, rAnimation.maGlobalSize ); rOStm.WriteUInt16( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ); - rOStm.WriteUInt16( rAnimBmp.eDisposal ); + rOStm.WriteUInt16( (sal_uInt16)rAnimBmp.eDisposal ); rOStm.WriteBool( rAnimBmp.bUserInput ); rOStm.WriteUInt32( rAnimation.mnLoopCount ); rOStm.WriteUInt32( nDummy32 ); // Unused diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index ce0947b4daa0..2606283c5cd6 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -37,7 +37,7 @@ ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut, maClip ( mpOut->GetClipRegion() ), mpBackground ( VclPtr<VirtualDevice>::Create() ), mpRestore ( VclPtr<VirtualDevice>::Create() ), - meLastDisposal ( DISPOSE_BACK ), + meLastDisposal ( Disposal::Back ), mbPause ( false ), mbMarked ( false ), mbHMirr ( maSz.Width() < 0L ), @@ -251,15 +251,15 @@ void ImplAnimView::draw( sal_uLong nPos, VirtualDevice* pVDev ) // restore background after each run if( !nPos ) { - meLastDisposal = DISPOSE_BACK; + meLastDisposal = Disposal::Back; maRestPt = Point(); maRestSz = maSzPix; } // restore - if( ( DISPOSE_NOT != meLastDisposal ) && maRestSz.Width() && maRestSz.Height() ) + if( ( Disposal::Not != meLastDisposal ) && maRestSz.Width() && maRestSz.Height() ) { - if( DISPOSE_BACK == meLastDisposal ) + if( Disposal::Back == meLastDisposal ) pDev->DrawOutDev( maRestPt, maRestSz, maRestPt, maRestSz, *mpBackground ); else pDev->DrawOutDev( maRestPt, maRestSz, Point(), maRestSz, *mpRestore ); @@ -272,7 +272,7 @@ void ImplAnimView::draw( sal_uLong nPos, VirtualDevice* pVDev ) // What do we need to restore the next time? // Put it into a bitmap if needed, else delete // SaveBitmap to conserve memory - if( ( meLastDisposal == DISPOSE_BACK ) || ( meLastDisposal == DISPOSE_NOT ) ) + if( ( meLastDisposal == Disposal::Back ) || ( meLastDisposal == Disposal::Not ) ) mpRestore->SetOutputSizePixel( Size( 1, 1 ), false ); else { |