ZVISION: Add underscore prefix to public static variable names

This commit is contained in:
richiesams 2013-07-15 10:36:24 -05:00
parent 644313e8f2
commit 8de12fcbd2
2 changed files with 8 additions and 8 deletions

View File

@ -33,17 +33,17 @@ LzssReadStream::LzssReadStream(Common::SeekableReadStream *source, bool stream,
_readCursor(0),
_eosFlag(false) {
// Clear the window to null
memset(_window, 0, blockSize);
memset(_window, 0, _blockSize);
// Reserve space in the destination buffer
// TODO: Make a better guess
if (decompressedSize == npos) {
if (decompressedSize == _npos) {
decompressedSize = source->size();
}
_destination.reserve(decompressedSize);
if (stream)
decompressBytes(blockSize);
decompressBytes(_blockSize);
else
decompressAll();
}
@ -120,7 +120,7 @@ uint32 LzssReadStream::read(void *dataPtr, uint32 dataSize) {
break;
}
decompressBytes(blockSize);
decompressBytes(_blockSize);
}
if (dataSize > 0) {

View File

@ -41,16 +41,16 @@ public:
* @param stream Decompress the data as needed (true) or all at once (false)
* @param decompressedSize The size of the decompressed data. If npos, the class will choose a size and grow as needed
*/
LzssReadStream(Common::SeekableReadStream *source, bool stream = true, uint32 decompressedSize = npos);
LzssReadStream(Common::SeekableReadStream *source, bool stream = true, uint32 decompressedSize = _npos);
public:
static const uint32 npos = 0xFFFFFFFFu;
static const uint16 blockSize = 0x1000u;
static const uint32 _npos = 0xFFFFFFFFu;
static const uint16 _blockSize = 0x1000u;
private:
Common::SeekableReadStream *_source;
Common::Array<char> _destination;
char _window[blockSize];
char _window[_blockSize];
uint16 _windowCursor;
uint32 _readCursor;
bool _eosFlag;