diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-04-27 23:08:01 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-04-28 05:31:16 +0200 |
| commit | 6bcc4cb109b4ab6ec194a04c53cf1d545a7a7dfd (patch) | |
| tree | c89f80ddca6eb9dc4c118478e873bc46b7584f6c /vcl/source/graphic | |
| parent | 9afa666120d8bb045f3569a77475a58c368c03a1 (diff) | |
prefix member variables of AnimationBitmap
Change-Id: Ic84773399c95d61f843e4388fe01d00cd4facc5a
Reviewed-on: https://gerrit.libreoffice.org/71425
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/source/graphic')
| -rw-r--r-- | vcl/source/graphic/GraphicObject.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx index bcfc50c849a1..be2dc76bd2a6 100644 --- a/vcl/source/graphic/GraphicObject.cxx +++ b/vcl/source/graphic/GraphicObject.cxx @@ -778,21 +778,21 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo for( size_t nFrame=0; nFrame<aAnim.Count(); ++nFrame ) { - AnimationBitmap aAnimBmp( aAnim.Get( nFrame ) ); + AnimationBitmap aAnimationBitmap( aAnim.Get( nFrame ) ); - if( !aCropRect.IsInside( tools::Rectangle(aAnimBmp.aPosPix, aAnimBmp.aSizePix) ) ) + if( !aCropRect.IsInside( tools::Rectangle(aAnimationBitmap.maPositionPixel, aAnimationBitmap.maSizePixel) ) ) { // setup actual cropping (relative to frame position) tools::Rectangle aCropRectRel( aCropRect ); - aCropRectRel.Move( -aAnimBmp.aPosPix.X(), - -aAnimBmp.aPosPix.Y() ); + aCropRectRel.Move( -aAnimationBitmap.maPositionPixel.X(), + -aAnimationBitmap.maPositionPixel.Y() ); // cropping affects this frame, apply it then // do _not_ apply enlargement, this is done below - ImplTransformBitmap( aAnimBmp.aBmpEx, rAttr, Size(), Size(), + ImplTransformBitmap( aAnimationBitmap.maBitmapEx, rAttr, Size(), Size(), aCropRectRel, rDestSize, false ); - aAnim.Replace( aAnimBmp, nFrame ); + aAnim.Replace( aAnimationBitmap, nFrame ); } // else: bitmap completely within crop area, // i.e. nothing is cropped away @@ -822,11 +822,11 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo for( size_t nFrame=0; nFrame<aAnim.Count(); ++nFrame ) { - AnimationBitmap aAnimBmp( aAnim.Get( nFrame ) ); + AnimationBitmap aAnimationBitmap( aAnim.Get( nFrame ) ); - aAnimBmp.aPosPix += aPosOffset; + aAnimationBitmap.maPositionPixel += aPosOffset; - aAnim.Replace( aAnimBmp, nFrame ); + aAnim.Replace( aAnimationBitmap, nFrame ); } } |