AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Renamed functions to avoid confusion.

Browse Source
This commit is contained in:
Daviw Williams 2013-10-02 15:09:55 +02:00
parent 513c3a90b0
commit 29ca1e763f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/PolyVoxCore/include/PolyVoxCore/MinizBlockCompressor.h
View File

@ -45,8 +45,8 @@ namespace PolyVox
private:
uint32_t getMaxCompressedSize(uint32_t uUncompressedInputSize);
uint32_t compress(const void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength);
uint32_t decompress(const void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength);
uint32_t compressWithMiniz(const void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength);
uint32_t decompressWithMiniz(const void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength);
unsigned int m_uCompressionFlags;

10
library/PolyVoxCore/include/PolyVoxCore/MinizBlockCompressor.inl
View File

@ -80,7 +80,7 @@ namespace PolyVox
try
{
// Perform the compression
uCompressedLength = compress(pSrcData, uSrcLength, pDstData, uDstLength);
uCompressedLength = compressWithMiniz(pSrcData, uSrcLength, pDstData, uDstLength);
// Copy the resulting compressed data into the compressed block
pDstBlock->setData(pDstData, uCompressedLength);
@ -101,7 +101,7 @@ namespace PolyVox
try
{
// Perform the compression
uCompressedLength = compress(pSrcData, uSrcLength, pDstData, uDstLength);
uCompressedLength = compressWithMiniz(pSrcData, uSrcLength, pDstData, uDstLength);
// Copy the resulting compressed data into the compressed block
pDstBlock->setData(pDstData, uCompressedLength);
@ -128,7 +128,7 @@ namespace PolyVox
//RLECompressor<VoxelType, uint16_t> compressor;
uint32_t uUncompressedLength = decompress(pSrcData, uSrcLength, pDstData, uDstLength);
uint32_t uUncompressedLength = decompressWithMiniz(pSrcData, uSrcLength, pDstData, uDstLength);
POLYVOX_ASSERT(uUncompressedLength == pDstBlock->getDataSizeInBytes(), "Destination length has changed.");
}
@ -145,7 +145,7 @@ namespace PolyVox
}
template <typename VoxelType>
uint32_t MinizBlockCompressor<VoxelType>::compress(const void* pSrcData, size_t uSrcLength, void* pDstData, size_t uDstLength)
uint32_t MinizBlockCompressor<VoxelType>::compressWithMiniz(const void* pSrcData, size_t uSrcLength, void* pDstData, size_t uDstLength)
{
// Compress as much of the input as possible (or all of it) to the output buffer.
tdefl_status status = tdefl_compress(m_pDeflator, pSrcData, &uSrcLength, pDstData, &uDstLength, TDEFL_FINISH);
@ -163,7 +163,7 @@ namespace PolyVox
}
template <typename VoxelType>
uint32_t MinizBlockCompressor<VoxelType>::decompress(const void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength)
uint32_t MinizBlockCompressor<VoxelType>::decompressWithMiniz(const void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength)
{
// I don't know exactly why this limitation exists but it's an implementation detail of miniz. It shouldn't matter for our purposes
// as our detination is a Block and those are always a power of two. If you need to use this class for other purposes then you'll