summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-09-25 21:17:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-09-25 21:17:37 +0100
commit6bd3c2ca4b904abfe54509ff292a99a64e228ab8 (patch)
tree56523c12088bc05936ec206c3e0bf711858460ad
parent88fe2590901b9c0955b97e0521b20dba9a8a97da (diff)
improve scoping
Change-Id: I69019979b59929ea65bdca56a731ee764fbe3e08
-rw-r--r--filter/source/graphicfilter/etiff/etiff.cxx20
1 files changed, 9 insertions, 11 deletions
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 )
{