diff options
| author | shashikdm <shashikant.123kadam@gmail.com> | 2019-12-08 19:46:45 +0530 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-01-15 19:12:37 +0100 |
| commit | cf82475c785c47327cdc9d591d63d7a82dd1ac53 (patch) | |
| tree | ed639a7a4b241be91fa7edcaffc3a58cc21c4c06 /filter/source/graphicfilter/itiff/itiff.cxx | |
| parent | 797e0170f31ef10df0841e1cfae5c39903b6a316 (diff) | |
tdf#114441 Changing sal_uLong to appropriate integer type in filters module
changed sal_uLong to one of {size_t, sal_uInt64, sal_uInt32, sal_uInt16, sal_uInt8} in flash/impswfdialog.cxx and graphicsfilter
changed PS_* in file filter/source/eps/eps.cxx to enum and overloaded bitwise or (|)
made types of nSize, nParseThis, nComp and nBytesRead to sal_uInt32 as Michael Stahl suggested
changes suggested by Michael Stahl
changed x, y, j to sal_uInt32 in filter/source/graphicfilter/etiff/etiff.cxx
changed nMinPercent, nMaxPercent, nLastPercent, nMainEntitiesCount to sal_uInt16 in filter/source/graphicfilter/idxf/dxf2mtf.hxx
removed nGcount variable from filter/source/graphicfilter/idxf/dxfgrprd.hxx and filter/source/graphicfilter/idxf/dxfgrprd.cxx
removed static_cast in filter/source/graphicfilter/idxf/dxf2mtf.cxx
changed nComp in filter/source/graphicfilter/ieps/ieps.cxx to size_t
changed mnCol to sal_uInt16 in filter/source/graphicfilter/ipbm/ipbm.cxx
revised a number of datatypes as suggested by michael stahl in his reviews
removed redundant static casts which caused test to fail
Change-Id: Id892ee7e9c1ef3cf75c9d768b790ced9c2ce3f3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84726
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'filter/source/graphicfilter/itiff/itiff.cxx')
| -rw-r--r-- | filter/source/graphicfilter/itiff/itiff.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index d16410ad04c6..d5678db25dba 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1580,7 +1580,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) if (bStatus) { - sal_uLong nTargetBits = nImageWidth * nBitsPerSample * nSamplesPerPixel / nPlanes; + sal_uInt64 nTargetBits = nImageWidth * nBitsPerSample * nSamplesPerPixel / nPlanes; if (nTargetBits > SAL_MAX_UINT16) bStatus = false; } |