Merge branch 'develop' into feature/cubiquity-version

This commit is contained in:
David Williams 2013-08-19 16:28:23 +02:00
commit 886c66d7c3

View File

@ -53,7 +53,7 @@ namespace PolyVox
uCompressedLength = m_pCompressor->compress(pSrcData, uSrcLength, pDstData, uDstLength); uCompressedLength = m_pCompressor->compress(pSrcData, uSrcLength, pDstData, uDstLength);
// Copy the resulting compressed data into the compressed block // Copy the resulting compressed data into the compressed block
pDstBlock->setData(pDstData, uDstLength); pDstBlock->setData(pDstData, uCompressedLength);
} }
catch(std::exception&) catch(std::exception&)
{ {
@ -74,7 +74,7 @@ namespace PolyVox
uCompressedLength = m_pCompressor->compress(pSrcData, uSrcLength, pDstData, uDstLength); uCompressedLength = m_pCompressor->compress(pSrcData, uSrcLength, pDstData, uDstLength);
// Copy the resulting compressed data into the compressed block // Copy the resulting compressed data into the compressed block
pDstBlock->setData(pDstData, uDstLength); pDstBlock->setData(pDstData, uCompressedLength);
} }
catch(std::exception&) catch(std::exception&)
{ {