diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2023-08-09 18:00:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-09 22:34:16 +0200 |
| commit | c1d690d8c478a9d2692a89cbb982b59df5438972 (patch) | |
| tree | c058c9d3a1f2d0c6d6b0f6e410b0e6c77b1ca2d8 /emfio | |
| parent | b321cf78808f918669139793a65a3bf4908faa46 (diff) | |
use sal_uInt64 when dealing with stream position
Change-Id: I34a8ec2f69d9d58f8847e9cfb45937eae6159590
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155528
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'emfio')
| -rw-r--r-- | emfio/source/emfuno/xemfparser.cxx | 2 | ||||
| -rw-r--r-- | emfio/source/reader/emfreader.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx index 55b96e31c222..c8641d3f2acc 100644 --- a/emfio/source/emfuno/xemfparser.cxx +++ b/emfio/source/emfuno/xemfparser.cxx @@ -102,7 +102,7 @@ namespace emfio::emfreader // rough check - import and conv to primitive GDIMetaFile aMtf; std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream(xEmfStream)); - sal_uInt32 nOrgPos = pStream->Tell(); + sal_uInt64 nOrgPos = pStream->Tell(); SvStreamEndian nOrigNumberFormat = pStream->GetEndian(); pStream->SetEndian(SvStreamEndian::LITTLE); diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index 73a082eae2e8..f1ac4ff7eda5 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -1475,7 +1475,7 @@ namespace emfio sal_uInt32 BkColorSrc(0), iUsageSrc(0), offBmiSrc(0); sal_uInt32 cbBmiSrc(0), offBitsSrc(0), cbBitsSrc(0); - sal_uInt32 nStart = mpInputStream->Tell() - 8; + sal_uInt64 nStart = mpInputStream->Tell() - 8; mpInputStream->SeekRel( 0x10 ); mpInputStream->ReadInt32( xDest ).ReadInt32( yDest ).ReadInt32( cxDest ).ReadInt32( cyDest ); @@ -1636,7 +1636,7 @@ namespace emfio sal_uInt32 dwRop, iUsageSrc, offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc; XForm xformSrc; - sal_uInt32 nStart = mpInputStream->Tell() - 8; + sal_uInt64 nStart = mpInputStream->Tell() - 8; mpInputStream->SeekRel( 0x10 ); mpInputStream->ReadInt32( xDest ).ReadInt32( yDest ).ReadInt32( cxDest ).ReadInt32( cyDest ).ReadUInt32( dwRop ).ReadInt32( xSrc ).ReadInt32( ySrc ) @@ -1712,7 +1712,7 @@ namespace emfio { sal_Int32 xDest, yDest, xSrc, ySrc, cxSrc, cySrc, cxDest, cyDest; sal_uInt32 offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc, iUsageSrc, dwRop; - sal_uInt32 nStart = mpInputStream->Tell() - 8; + sal_uInt64 nStart = mpInputStream->Tell() - 8; mpInputStream->SeekRel( 0x10 ); mpInputStream->ReadInt32( xDest ) @@ -2075,7 +2075,7 @@ namespace emfio case EMR_CREATEDIBPATTERNBRUSHPT : { - sal_uInt32 nStart = mpInputStream->Tell() - 8; + sal_uInt64 nStart = mpInputStream->Tell() - 8; Bitmap aBitmap; mpInputStream->ReadUInt32( nIndex ); @@ -2256,8 +2256,8 @@ namespace emfio SAL_INFO("emfio", "\tMetafile size: " << mnEndPos); mnEndPos += mnStartPos; - sal_uInt32 nStrmPos = mpInputStream->Tell(); // checking if mnEndPos is valid - sal_uInt32 nActualFileSize = nStrmPos + mpInputStream->remainingSize(); + sal_uInt64 nStrmPos = mpInputStream->Tell(); // checking if mnEndPos is valid + sal_uInt64 nActualFileSize = nStrmPos + mpInputStream->remainingSize(); if ( nActualFileSize < mnEndPos ) { |