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

Caolán McNamara caolanm at redhat.com
Sat Jan 24 09:01:09 PST 2015


 vcl/source/gdi/dibtools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 79c727e574f2cbc53e35bb6be6d9ddc8fa746faf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 24 16:48:34 2015 +0000

    coverity#1264390 try and help coverity out wrt Bad bit shift operation
    
    nBitCount can only be <=8 if aHeader.nBitCount <= 8, hopefully using
    aHeader.nBitCount here will make it clear to coverity that aHeader.nBitCount
    cannot be more than 31 and thus silence that warning
    
    Change-Id: Ie195ab55cafb9a967c1face8070089e040b242fa

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 1a9eb33..5ee404f 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -758,7 +758,7 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, Bitmap* pBmpAlpha, sal_uLon
             SvMemoryStream* pMemStm = NULL;
             sal_uInt8* pData = NULL;
 
-            if(nBitCount <= 8)
+            if (aHeader.nBitCount <= 8)
             {
                 if(aHeader.nColsUsed)
                 {


More information about the Libreoffice-commits mailing list