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 /filter | |
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 'filter')
-rw-r--r-- | filter/source/graphicfilter/egif/egif.cxx | 6 | ||||
-rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 3ba9ff0d8874..9c90c0f0f244 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -59,7 +59,7 @@ class GIFWriter void WriteAnimation( const Animation& rAnimation ); void WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint, bool bExtended, - long nTimer = 0, Disposal eDisposal = DISPOSE_NOT ); + long nTimer = 0, Disposal eDisposal = Disposal::Not ); css::uno::Reference< css::task::XStatusIndicator > xStatusIndicator; @@ -385,9 +385,9 @@ void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal ) cFlags |= 1; // set Disposal-value - if( eDisposal == DISPOSE_BACK ) + if( eDisposal == Disposal::Back ) cFlags |= ( 2 << 2 ); - else if( eDisposal == DISPOSE_PREVIOUS ) + else if( eDisposal == Disposal::Previous ) cFlags |= ( 3 << 2 ); m_rGIF.WriteUChar( 0x21 ); diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index c87e8f8e24f7..d7a26ead6670 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1420,7 +1420,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) aImage = aBitmap; AnimationBitmap aAnimationBitmap( aImage, Point( 0, 0 ), aBitmap.GetSizePixel(), - ANIMATION_TIMEOUT_ON_CLICK, DISPOSE_BACK ); + ANIMATION_TIMEOUT_ON_CLICK, Disposal::Back ); aAnimation.Insert( aAnimationBitmap ); } |