arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleared "conversion from 'const int' to 'CryptoPP::word16'" under MSVC

pull/35/head
Jeffrey Walton 2015-07-26 12:52:13 -04:00
parent 5eefa99e68
commit 5db65c051b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zdeflate.cpp
View File

@ -289,7 +289,7 @@ void Deflator::Reset(bool forceReset)
m_detectSkip = 0; m_detectSkip = 0;
// m_prev will be initialized automaticly in InsertString // m_prev will be initialized automaticly in InsertString
fill(m_head.begin(), m_head.end(), 0); fill(m_head.begin(), m_head.end(), word16(0));
fill(m_literalCounts.begin(), m_literalCounts.end(), 0); fill(m_literalCounts.begin(), m_literalCounts.end(), 0);
fill(m_distanceCounts.begin(), m_distanceCounts.end(), 0); fill(m_distanceCounts.begin(), m_distanceCounts.end(), 0);
@ -643,10 +643,10 @@ void Deflator::EncodeBlock(bool eof, unsigned int blockType)
if (blockType == STORED) if (blockType == STORED)
{ {
assert(m_blockStart + m_blockLength <= m_byteBuffer.size()); assert(m_blockStart + m_blockLength <= m_byteBuffer.size());
assert(m_blockLength <= 0xffff); assert(m_blockLength <= 65535);
FlushBitBuffer(); FlushBitBuffer();
AttachedTransformation()->PutWord16(m_blockLength, LITTLE_ENDIAN_ORDER); AttachedTransformation()->PutWord16(static_cast<word16>(m_blockLength), LITTLE_ENDIAN_ORDER);
AttachedTransformation()->PutWord16(~m_blockLength, LITTLE_ENDIAN_ORDER); AttachedTransformation()->PutWord16(static_cast<word16>(~m_blockLength), LITTLE_ENDIAN_ORDER);
AttachedTransformation()->Put(m_byteBuffer + m_blockStart, m_blockLength); AttachedTransformation()->Put(m_byteBuffer + m_blockStart, m_blockLength);
} }
else else