From 49747ff2337fd1f4a3ee8e16d6328b8dacad99ec Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Sat, 3 Nov 2018 15:43:04 +0300 Subject: tdf#120703 PVS: V547 Expression is always true/false Change-Id: I75082c85862b83ed2503900186ce9c70783e54db Reviewed-on: https://gerrit.libreoffice.org/62817 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- vcl/source/gdi/dibtools.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index accae76a3726..b6ffa8fd9908 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -917,8 +917,7 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_uL // (partially) check the image dimensions to avoid potential large bitmap allocation if the input is damaged sal_uInt64 nMaxWidth = pIStm->remainingSize(); nMaxWidth *= 256; //assume generous compression ratio - if (aHeader.nHeight != 0) - nMaxWidth /= aHeader.nHeight; + nMaxWidth /= aHeader.nHeight; if (nMaxWidth < static_cast(aHeader.nWidth)) return false; break; @@ -929,8 +928,7 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_uL return false; sal_uInt64 nMaxWidth = pIStm->remainingSize(); nMaxWidth *= 512; //assume generous compression ratio - if (aHeader.nHeight != 0) - nMaxWidth /= aHeader.nHeight; + nMaxWidth /= aHeader.nHeight; if (nMaxWidth < static_cast(aHeader.nWidth)) return false; break; @@ -942,8 +940,7 @@ bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha, sal_uL { // (partially) check the image dimensions to avoid potential large bitmap allocation if the input is damaged sal_uInt64 nMaxWidth = pIStm->remainingSize(); - if (aHeader.nHeight != 0) - nMaxWidth /= aHeader.nHeight; + nMaxWidth /= aHeader.nHeight; if (nMaxWidth < nAlignedWidth) return false; break; -- cgit