aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-10 01:09:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-12-11 12:43:05 +01:00
parent 486a5e4638
commit f3147c7616
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/client/src/seven_zip/seven_zip.cpp
View file

@ -295,7 +295,7 @@ bool packLZMA(const std::string &srcFileName, const std::string &lzmaFileName)
std::vector<uint8> outProps(outPropsSize); std::vector<uint8> outProps(outPropsSize);
// compress with best compression and other default settings // compress with best compression and other default settings
sint res = LzmaCompress(outBuffer.get(), &outSize, inBuffer.get(), inSize, outProps.get(), &outPropsSize, 9, 1 << 27, -1, -1, -1, -1, 1); sint res = LzmaCompress(&outBuffer[0], &outSize, &inBuffer[0], inSize, &outProps[0], &outPropsSize, 9, 1 << 27, -1, -1, -1, -1, 1);
switch(res) switch(res)
{ {
@ -314,14 +314,14 @@ bool packLZMA(const std::string &srcFileName, const std::string &lzmaFileName)
try try
{ {
// write props // write props
outStream.serialBuffer(outProps.get(), (uint)outPropsSize); outStream.serialBuffer(&outProps[0], (uint)outPropsSize);
// write uncompressed size // write uncompressed size
uint64 uncompressSize = inSize; uint64 uncompressSize = inSize;
outStream.serial(uncompressSize); outStream.serial(uncompressSize);
// write content // write content
outStream.serialBuffer(outBuffer.get(), (uint)outSize); outStream.serialBuffer(&outBuffer[0], (uint)outSize);
} }
catch(const EFile &e) catch(const EFile &e)
{ {