[Libreoffice-commits] .: svtools/source

Caolán McNamara caolan at kemper.freedesktop.org
Sun Dec 5 03:59:48 PST 2010


 svtools/source/filter.vcl/filter/sgfbram.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bd4b7c12312240bfbd54f2826678ddd487086e6d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 5 11:59:41 2010 +0000

    cppcheck: Can reduce the scope of this variable

diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter.vcl/filter/sgfbram.cxx
index a4166bb..6fc612c 100644
--- a/svtools/source/filter.vcl/filter/sgfbram.cxx
+++ b/svtools/source/filter.vcl/filter/sgfbram.cxx
@@ -297,7 +297,7 @@ BOOL SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
     USHORT         nColBits;           // Anzahl der Bits/Pixel (2, 4,  8)
     USHORT         i,j,k;              // Spaltenzaehler, Zeilenzaehler, Planezaehler
     USHORT         a,b;                // Hilfsvariable
-    BYTE           pl1 = 0,pl2= 0;     // Masken fuer die Planes
+    BYTE           pl1 = 0;            // Masken fuer die Planes
     BYTE*          pBuf=NULL;          // Buffer fuer eine Pixelzeile
     PcxExpand      aPcx;
     ULONG          nOfs;
@@ -344,6 +344,8 @@ BOOL SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
             rOut.Write((char*)pBuf,nWdtOut);
         }
     } else if (nColors==16) {
+        BYTE pl2= 0;     // Masken fuer die Planes
+
         rOut<<RGBQuad(0x00,0x00,0x00); // Schwarz
         rOut<<RGBQuad(0x24,0x24,0x24); // Grau 80%
         rOut<<RGBQuad(0x49,0x49,0x49); // Grau 60%


More information about the Libreoffice-commits mailing list