[Libreoffice-commits] core.git: filter/source

Caolán McNamara caolanm at redhat.com
Tue Feb 14 10:26:52 UTC 2017


 filter/source/graphicfilter/iras/iras.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 2fbc3a4e82433532a7f3c2a978f5f8cae6981979
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 14 10:26:12 2017 +0000

    reduce scope of maBmp
    
    Change-Id: I8605ec535bc8a948cf0dc0dd194e673b73939035

diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 9172ef9..0836ac5 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -43,7 +43,6 @@ private:
     SvStream&           m_rRAS;                 // Die einzulesende RAS-Datei
 
     bool                mbStatus;
-    Bitmap              maBmp;
     sal_Int32           mnWidth, mnHeight;      // Bildausmass in Pixeln
     sal_uInt16          mnDstBitsPerPix;
     sal_uInt16          mnDstColors;
@@ -97,8 +96,8 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
     if ( !mbStatus )
         return false;
 
-    maBmp = Bitmap( Size( mnWidth, mnHeight ), mnDstBitsPerPix );
-    Bitmap::ScopedWriteAccess pAcc(maBmp);
+    Bitmap aBmp(Size(mnWidth, mnHeight), mnDstBitsPerPix);
+    Bitmap::ScopedWriteAccess pAcc(aBmp);
     if ( pAcc == nullptr )
         return false;
 
@@ -163,7 +162,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
     mbStatus = ImplReadBody(pAcc.get());
 
     if ( mbStatus )
-        rGraphic = maBmp;
+        rGraphic = aBmp;
 
     return mbStatus;
 }


More information about the Libreoffice-commits mailing list