merge of branch v0.6-idclean 7180

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions

View file

@ -135,7 +135,7 @@ bool RsCompress::uncompress_memory_chunk(const uint8_t *input_mem,const uint32_t
do
{
uint32_t available_in = std::min(CHUNK,remaining_input) ;
memcpy(in,input_mem,available_in) ;
memcpy(in,input_mem+input_offset,available_in) ;
strm.avail_in = available_in ;
remaining_input -= available_in ;
input_offset += available_in ;