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

Removed old code.

Browse Source
This commit is contained in:
Daviw Williams
2013-02-25 16:34:21 +01:00
parent 34671130fb
commit f70498e806
3 changed files with 6 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
library/PolyVoxCore/source/MinizCompressor.cpp
View File

@@ -55,24 +55,6 @@ namespace PolyVox
return MZ_MAX(128 + (source_len * 110) / 100, 128 + source_len + ((source_len / (31 * 1024)) + 1) * 5); return MZ_MAX(128 + (source_len * 110) / 100, 128 + source_len + ((source_len / (31 * 1024)) + 1) * 5);
} }
// The commented out function is left here for reference and debugging purposes.
/*uint32_t MinizCompressor::compress(void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength)
{
mz_ulong ulDstLength = uDstLength;
// Do the compression
int result = mz_compress((unsigned char*)pDstData, &ulDstLength, (const unsigned char*) pSrcData, uSrcLength);
if(result != MZ_OK)
{
stringstream ss;
ss << "mz_compress() failed with return code '" << result << "'";
POLYVOX_THROW(std::runtime_error, ss.str());
}
// Return the number of bytes written to the output.
return ulDstLength;
}*/
// The behaviour of this function should be the same as the commented out version above (except that it requires the destination to be a power of two), // The behaviour of this function should be the same as the commented out version above (except that it requires the destination to be a power of two),
// but it's implemented using the lower level API which does not conflict with zlib or perform any memory allocations. // but it's implemented using the lower level API which does not conflict with zlib or perform any memory allocations.
uint32_t MinizCompressor::compress(void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength) uint32_t MinizCompressor::compress(void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength)
@@ -102,22 +84,6 @@ namespace PolyVox
return ulDstLength; return ulDstLength;
} }
// The commented out function is left here for reference and debugging purposes.
/*uint32_t MinizCompressor::decompress(void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength)
{
mz_ulong ulDstLength = uDstLength;
int result = mz_uncompress((unsigned char*) pDstData, &ulDstLength, (const unsigned char*) pSrcData, uSrcLength);
if(result != MZ_OK)
{
stringstream ss;
ss << "mz_uncompress() failed with return code '" << result << "'";
POLYVOX_THROW(std::runtime_error, ss.str());
}
return ulDstLength;
}*/
// The behaviour of this function should be the same as the commented out version above (except that it requires the destination to be a power of two), // The behaviour of this function should be the same as the commented out version above (except that it requires the destination to be a power of two),
// but it's implemented using the lower level API which does not conflict with zlib or perform any memory allocations. // but it's implemented using the lower level API which does not conflict with zlib or perform any memory allocations.
uint32_t MinizCompressor::decompress(void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength) uint32_t MinizCompressor::decompress(void* pSrcData, uint32_t uSrcLength, void* pDstData, uint32_t uDstLength)

8
tests/testvolume.cpp
View File

@@ -312,7 +312,7 @@ TestVolume::~TestVolume()
* RawVolume Tests * RawVolume Tests
*/ */
void TestVolume::testRawVolumeDirectAccessAllInternalForwards() /*void TestVolume::testRawVolumeDirectAccessAllInternalForwards()
{ {
int32_t result = 0; int32_t result = 0;
@@ -398,13 +398,13 @@ void TestVolume::testRawVolumeSamplersWithExternalBackwards()
result = testSamplersWithWrappingBackwards(m_pRawVolume, -1, -3, -2, 2, 5, 4); result = testSamplersWithWrappingBackwards(m_pRawVolume, -1, -3, -2, 2, 5, 4);
} }
QCOMPARE(result, static_cast<int32_t>(-769775893)); QCOMPARE(result, static_cast<int32_t>(-769775893));
} }*/
/* /*
* SimpleVolume Tests * SimpleVolume Tests
*/ */
void TestVolume::testSimpleVolumeDirectAccessAllInternalForwards() /*void TestVolume::testSimpleVolumeDirectAccessAllInternalForwards()
{ {
int32_t result = 0; int32_t result = 0;
QBENCHMARK QBENCHMARK
@@ -482,7 +482,7 @@ void TestVolume::testSimpleVolumeSamplersWithExternalBackwards()
result = testSamplersWithWrappingBackwards(m_pSimpleVolume, -1, -3, -2, 2, 5, 4); result = testSamplersWithWrappingBackwards(m_pSimpleVolume, -1, -3, -2, 2, 5, 4);
} }
QCOMPARE(result, static_cast<int32_t>(-769775893)); QCOMPARE(result, static_cast<int32_t>(-769775893));
} }*/
/* /*
* LargeVolume Tests * LargeVolume Tests

4
tests/testvolume.h
View File

@@ -37,7 +37,7 @@ public:
~TestVolume(); ~TestVolume();
private slots: private slots:
void testRawVolumeDirectAccessAllInternalForwards(); /*void testRawVolumeDirectAccessAllInternalForwards();
void testRawVolumeSamplersAllInternalForwards(); void testRawVolumeSamplersAllInternalForwards();
void testRawVolumeDirectAccessWithExternalForwards(); void testRawVolumeDirectAccessWithExternalForwards();
void testRawVolumeSamplersWithExternalForwards(); void testRawVolumeSamplersWithExternalForwards();
@@ -53,7 +53,7 @@ private slots:
void testSimpleVolumeDirectAccessAllInternalBackwards(); void testSimpleVolumeDirectAccessAllInternalBackwards();
void testSimpleVolumeSamplersAllInternalBackwards(); void testSimpleVolumeSamplersAllInternalBackwards();
void testSimpleVolumeDirectAccessWithExternalBackwards(); void testSimpleVolumeDirectAccessWithExternalBackwards();
void testSimpleVolumeSamplersWithExternalBackwards(); void testSimpleVolumeSamplersWithExternalBackwards();*/
void testLargeVolumeDirectAccessAllInternalForwards(); void testLargeVolumeDirectAccessAllInternalForwards();
void testLargeVolumeSamplersAllInternalForwards(); void testLargeVolumeSamplersAllInternalForwards();