From 6bd3c2ca4b904abfe54509ff292a99a64e228ab8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 25 Sep 2016 21:17:37 +0100 Subject: improve scoping Change-Id: I69019979b59929ea65bdca56a731ee764fbe3e08 --- filter/source/graphicfilter/etiff/etiff.cxx | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'filter') diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 4214f0d7a8aa..3300d4b18597 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -172,28 +172,26 @@ bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterCo mnLatestIfdPos = m_rOStm.Tell(); m_rOStm.WriteUInt32( 0 ); - Animation aAnimation; - Bitmap aBmp; - if( mbStatus ) { - if ( rGraphic.IsAnimated() ) + Animation aAnimation; + + if (rGraphic.IsAnimated()) aAnimation = rGraphic.GetAnimation(); else { - AnimationBitmap aAnimationBitmap( rGraphic.GetBitmap(), Point(), Size() ); - aAnimation.Insert( aAnimationBitmap ); + AnimationBitmap aAnimationBitmap(rGraphic.GetBitmap(), Point(), Size()); + aAnimation.Insert(aAnimationBitmap); } - sal_uInt16 i; - for ( i = 0; i < aAnimation.Count(); i++ ) - mnSumOfAllPictHeight += aAnimation.Get( i ).aBmpEx.GetSizePixel().Height(); + for (sal_uInt16 i = 0; i < aAnimation.Count(); ++i) + mnSumOfAllPictHeight += aAnimation.Get(i).aBmpEx.GetSizePixel().Height(); - for ( i = 0; mbStatus && ( i < aAnimation.Count() ); i++ ) + for (sal_uInt16 i = 0; mbStatus && i < aAnimation.Count(); ++i) { mnPalPos = 0; const AnimationBitmap& rAnimationBitmap = aAnimation.Get( i ); - aBmp = rAnimationBitmap.aBmpEx.GetBitmap(); + Bitmap aBmp = rAnimationBitmap.aBmpEx.GetBitmap(); mpAcc = aBmp.AcquireReadAccess(); if ( mpAcc ) { -- cgit