lib3mf 2.5 :
- aggiornamento versione - utilizzate le nostre librerie esterne libzip e zlib e non quelle incluse in lib3mf.
This commit is contained in:
@@ -50,7 +50,7 @@ namespace NMR {
|
||||
m_strm.avail_in = 0;
|
||||
m_strm.next_in = Z_NULL;
|
||||
|
||||
if (inflateInit(&m_strm) != Z_OK)
|
||||
if (inflateInit2(&m_strm, -MAX_WBITS) != Z_OK)
|
||||
throw CNMRException(NMR_ERROR_COULDNOTINITINFLATE);
|
||||
}
|
||||
|
||||
@@ -128,8 +128,9 @@ namespace NMR {
|
||||
nfUint64 currentPosition = 0;
|
||||
nfUint64 chunkSize = IMPORTSTREAM_READ_BUFFER_CHUNKSIZE;
|
||||
do {
|
||||
m_decompressedBuffer.resize(m_decompressedBuffer.size() + chunkSize);
|
||||
bytesRead = readIntoBuffer(&m_decompressedBuffer[currentPosition], chunkSize, false);
|
||||
m_decompressedBuffer.resize((size_t) m_decompressedBuffer.size() + (size_t) chunkSize);
|
||||
bytesRead = readIntoBuffer(&m_decompressedBuffer[(size_t)currentPosition], chunkSize, false);
|
||||
|
||||
currentPosition += bytesRead;
|
||||
} while (chunkSize == bytesRead);
|
||||
return std::make_shared<CImportStream_Shared_Memory>(m_decompressedBuffer.data(), m_decompressedBuffer.size());
|
||||
|
||||
Reference in New Issue
Block a user