mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits

Browse Source 
in VisualStudio

reported by Luke Benes

Change-Id: I908039750a3e89e4d1b77631f7d309191735c765
This commit is contained in:
Noel Grandin
2016-05-20 10:42:23 +02:00
parent 5840c2787c
commit 4a8caa37fe
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oox/source/ole/vbainputstream.cxx
View File

@@ -157,7 +157,7 @@ bool VbaInputStream::updateChunk()
sal_uInt16 nCopyToken = mpInStrm->readuInt16(); sal_uInt16 nCopyToken = mpInStrm->readuInt16();
nChunkPos = nChunkPos + 2; nChunkPos = nChunkPos + 2;
// update bit count used for offset/length in the token // update bit count used for offset/length in the token
while( static_cast< size_t >( 1 << nBitCount ) < maChunk.size() ) ++nBitCount; while( ((static_cast<size_t>(1)) << nBitCount ) < maChunk.size() ) ++nBitCount;
// extract length from lower (16-nBitCount) bits, plus 3 // extract length from lower (16-nBitCount) bits, plus 3
sal_uInt16 nLength = extractValue< sal_uInt16 >( nCopyToken, 0, 16 - nBitCount ) + 3; sal_uInt16 nLength = extractValue< sal_uInt16 >( nCopyToken, 0, 16 - nBitCount ) + 3;
// extract offset from high nBitCount bits, plus 1 // extract offset from high nBitCount bits, plus 1

4
vcl/source/filter/igif/gifread.cxx
View File

@@ -248,7 +248,7 @@ bool GIFReader::ReadGlobalHeader()
bGlobalPalette = ( nRF & 0x80 ); bGlobalPalette = ( nRF & 0x80 );
if( bGlobalPalette ) if( bGlobalPalette )
ReadPaletteEntries( &aGPalette, 1 << ( ( nRF & 7 ) + 1 ) ); ReadPaletteEntries( &aGPalette, 1UL << ( ( nRF & 7 ) + 1 ) );
else else
nBackgroundColor = 0; nBackgroundColor = 0;
@@ -459,7 +459,7 @@ bool GIFReader::ReadLocalHeader()
if( nFlags & 0x80 ) if( nFlags & 0x80 )
{ {
pPal = &aLPalette; pPal = &aLPalette;
ReadPaletteEntries( pPal, 1 << ( (nFlags & 7 ) + 1 ) ); ReadPaletteEntries( pPal, 1UL << ( (nFlags & 7 ) + 1 ) );
} }
else else
pPal = &aGPalette; pPal = &aGPalette;