diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-04 17:06:47 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-04 16:57:59 +0100 |
| commit | 628e96ce1fce194b30a5c2912feb8b7ec0328db0 (patch) | |
| tree | 7a901d6da7d0dea1da3ac55ebe96fc33fc904150 /filter | |
| parent | 9d5365f7cacecf92f1f056dce7bb6bbaf9f0cc40 (diff) | |
tdf#120703 PVS: V547 Expression is always true/false
Change-Id: I3432afca1ee9bf9e8adce1d55d58d57bf1a09cb4
Reviewed-on: https://gerrit.libreoffice.org/62847
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/ipict/ipict.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 8b99ccbd1aa8..01e6fe296685 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -923,7 +923,7 @@ sal_uLong PictReader::ReadPixMapEtc( BitmapEx &rBitmap, bool bBaseAddr, bool bCo if (nRowBytes < 8 || nPackType == 1) { - if (nWidth && nHeight > pPict->remainingSize() / (sizeof(sal_uInt16) * nWidth)) + if (nHeight > pPict->remainingSize() / (sizeof(sal_uInt16) * nWidth)) return 0xffffffff; } else @@ -1021,10 +1021,10 @@ sal_uLong PictReader::ReadPixMapEtc( BitmapEx &rBitmap, bool bBaseAddr, bool bCo if ( nRowBytes < 8 || nPackType == 1 ) { const size_t nMaxPixels = pPict->remainingSize() / 4; - const size_t nMaxRows = nWidth ? nMaxPixels / nWidth : SAL_MAX_UINT16; + const size_t nMaxRows = nMaxPixels / nWidth; if (nHeight > nMaxRows) return 0xffffffff; - const size_t nMaxCols = nHeight ? nMaxPixels / nHeight : SAL_MAX_UINT16; + const size_t nMaxCols = nMaxPixels / nHeight; if (nWidth > nMaxCols) return 0xffffffff; @@ -1044,10 +1044,10 @@ sal_uLong PictReader::ReadPixMapEtc( BitmapEx &rBitmap, bool bBaseAddr, bool bCo else if ( nPackType == 2 ) { const size_t nMaxPixels = pPict->remainingSize() / 3; - const size_t nMaxRows = nWidth ? nMaxPixels / nWidth : SAL_MAX_UINT16; + const size_t nMaxRows = nMaxPixels / nWidth; if (nHeight > nMaxRows) return 0xffffffff; - const size_t nMaxCols = nHeight ? nMaxPixels / nHeight : SAL_MAX_UINT16; + const size_t nMaxCols = nMaxPixels / nHeight; if (nWidth > nMaxCols) return 0xffffffff; |