summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-02-16 13:47:34 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-02-16 13:47:34 +0000
commitb68594778f1728eed64801e9a243653381d163e4 (patch)
tree4867d47b54b09832cd525ab169b9a956530e9ac7 /src
parentf0823886a66100e193d6eeb0402eb872a67fa07d (diff)
Fix compile on 4.6.2 (no whatsnew)
Diffstat (limited to 'src')
-rw-r--r--src/lib/util/bitstream.h2
-rw-r--r--src/lib/util/chdcodec.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/util/bitstream.h b/src/lib/util/bitstream.h
index d95cf6c6bd1..e8aa8fa1184 100644
--- a/src/lib/util/bitstream.h
+++ b/src/lib/util/bitstream.h
@@ -110,7 +110,7 @@ private:
//-------------------------------------------------
inline bitstream_in::bitstream_in(const void *src, UINT32 srclength)
- : m_buffer(NULL),
+ : m_buffer(0),
m_bits(0),
m_read(reinterpret_cast<const UINT8 *>(src)),
m_doffset(0),
diff --git a/src/lib/util/chdcodec.c b/src/lib/util/chdcodec.c
index b0649cbd29b..5b37e8154e6 100644
--- a/src/lib/util/chdcodec.c
+++ b/src/lib/util/chdcodec.c
@@ -948,7 +948,7 @@ UINT32 chd_lzma_compressor::compress(const UINT8 *src, UINT32 srclen, UINT8 *des
throw CHDERR_COMPRESSION_ERROR;
// run it
- UINT32 complen = srclen;
+ SizeT complen = srclen;
res = LzmaEnc_MemEncode(encoder, dest, &complen, src, srclen, 0, NULL, &m_allocator, &m_allocator);
if (res != SZ_OK)
throw CHDERR_COMPRESSION_ERROR;
@@ -1035,8 +1035,8 @@ void chd_lzma_decompressor::decompress(const UINT8 *src, UINT32 complen, UINT8 *
LzmaDec_Init(&m_decoder);
// decode
- UINT32 consumedlen = complen;
- UINT32 decodedlen = destlen;
+ SizeT consumedlen = complen;
+ SizeT decodedlen = destlen;
ELzmaStatus status;
SRes res = LzmaDec_DecodeToBuf(&m_decoder, dest, &decodedlen, src, &consumedlen, LZMA_FINISH_END, &status);
if ((res != SZ_OK && res != LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK) || consumedlen != complen || decodedlen != destlen)