filter/source/graphicfilter/itiff/itiff.cxx | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
New commits:
commit ec010acad55dd81d735b0a45f498a3e60ffbf0b3
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Sep 20 14:54:05 2017 +0100
xAcc always exists at this point
Change-Id: Idea4b63bc8556ddd23c81385a050155b0e0012b3
Reviewed-on: https://gerrit.libreoffice.org/42549
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index 08d57fe9f5bf..279bfbed1095 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1400,25 +1400,22 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic &
rGraphic )
else
bStatus = false;
- if (xAcc)
- {
- xAcc.reset();
- xMaskAcc.reset();
+ xAcc.reset();
+ xMaskAcc.reset();
- if ( bStatus )
- {
- BitmapEx aImage;
+ if ( bStatus )
+ {
+ BitmapEx aImage;
- if (pAlphaMask)
- aImage = BitmapEx( aBitmap, *pAlphaMask );
- else
- aImage = aBitmap;
+ if (pAlphaMask)
+ aImage = BitmapEx( aBitmap, *pAlphaMask );
+ else
+ aImage = aBitmap;
- AnimationBitmap aAnimationBitmap( aImage, Point(
0, 0 ), aBitmap.GetSizePixel(),
-
ANIMATION_TIMEOUT_ON_CLICK, Disposal::Back );
+ AnimationBitmap aAnimationBitmap( aImage, Point( 0, 0
), aBitmap.GetSizePixel(),
+
ANIMATION_TIMEOUT_ON_CLICK, Disposal::Back );
- aAnimation.Insert( aAnimationBitmap );
- }
+ aAnimation.Insert( aAnimationBitmap );
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
