diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-08 17:27:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-08 21:16:14 +0200 |
| commit | 53d34f69a7fb29e6a6a1bf14bfefd958b79bdc0c (patch) | |
| tree | 8c7dee5530661a6f35ba79d3bfd8bb741266d6d0 /filter | |
| parent | bf54aa59d08984a45ed6adee32a919bfff87fd3d (diff) | |
ofz#7468 Abrt
Change-Id: I081f72806c3b5c9dca24988422584e7a438eb015
Reviewed-on: https://gerrit.libreoffice.org/52603
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/iras/iras.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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); |