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

[Caolán McNamara]

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

New commits:
commit 53d34f69a7fb29e6a6a1bf14bfefd958b79bdc0c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Apr 8 17:27:01 2018 +0100

    ofz#7468 Abrt
    
    Change-Id: I081f72806c3b5c9dca24988422584e7a438eb015
    Reviewed-on: https://gerrit.libreoffice.org/52603
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 1908afb6273c..6c851837163c 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -167,10 +167,10 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
     //for the sake of simplicity we'll assume that RAS_TYPE_BYTE_ENCODED can
     //describe data 255 times larger than the data stored
     size_t nMaxCompression = mnType != RAS_TYPE_BYTE_ENCODED ? 1 : 255;
-    sal_uInt32 nBitSize;
-    if (o3tl::checked_multiply<sal_uInt32>(mnWidth, mnHeight, nBitSize) || o3tl::checked_multiply<sal_uInt32>(nBitSize, mnDepth, nBitSize))
+    sal_Int32 nBitSize;
+    if (o3tl::checked_multiply<sal_Int32>(mnWidth, mnHeight, nBitSize) || o3tl::checked_multiply<sal_Int32>(nBitSize, mnDepth, nBitSize))
         return false;
-    if (m_rRAS.remainingSize() * nMaxCompression < nBitSize / 8)
+    if (m_rRAS.remainingSize() * nMaxCompression < static_cast<sal_uInt32>(nBitSize) / 8)
         return false;
 
     vcl::bitmap::RawBitmap aBmp(Size(mnWidth, mnHeight), 24);