diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:23:39 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:23:39 +0200 |
| commit | 9b94209f53782ecaf7084722ce90836573ceb86b (patch) | |
| tree | 42354553aeeb29d9490a3120f0c5cd687cbad370 /nxcomp/src/StaticCompressor.cpp | |
| parent | 91d9218c0cc659f40918af6ac6c035c6c48d2c6d (diff) | |
| parent | 16f6803f1597788b3bebcfa15e8900d8420b54a4 (diff) | |
| download | nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.gz nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.bz2 nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.zip | |
Merge branch 'uli42-pr/various9' into 3.6.x
Attributes GH PR #1029: https://github.com/ArcticaProject/nx-libs/pull/1029
Diffstat (limited to 'nxcomp/src/StaticCompressor.cpp')
| -rw-r--r-- | nxcomp/src/StaticCompressor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nxcomp/src/StaticCompressor.cpp b/nxcomp/src/StaticCompressor.cpp index b47193354..e9fd8c4e2 100644 --- a/nxcomp/src/StaticCompressor.cpp +++ b/nxcomp/src/StaticCompressor.cpp @@ -150,7 +150,7 @@ int StaticCompressor::compressBuffer(const unsigned char *plainBuffer, EncodeBuffer &encodeBuffer) { if (control -> LocalDataCompression == 0 || - compressBuffer(plainBuffer, plainSize, + compressBuffer(plainBuffer, plainSize, compressedBuffer, compressedSize) <= 0) { encodeBuffer.encodeBoolValue(0); @@ -204,7 +204,7 @@ int StaticCompressor::compressBuffer(const unsigned char *plainBuffer, // // Determine the size of the temporary - // buffer. + // buffer. // unsigned int newSize = plainSize + (plainSize / 1000) + 12; @@ -241,7 +241,7 @@ int StaticCompressor::compressBuffer(const unsigned char *plainBuffer, bufferSize_ = newSize; } - unsigned int resultingSize = newSize; + unsigned int resultingSize = newSize; int result = ZCompress(&compressionStream_, buffer_, &resultingSize, plainBuffer, plainSize); @@ -360,7 +360,7 @@ int StaticCompressor::decompressBuffer(unsigned char *plainBuffer, { #ifdef PANIC *logofs << "StaticCompressor: PANIC! Expected decompressed size was " - << plainSize << " while it is " << checkSize + << plainSize << " while it is " << checkSize << ".\n" << logofs_flush; #endif @@ -411,7 +411,7 @@ int StaticCompressor::decompressBuffer(unsigned char *plainBuffer, { #ifdef PANIC *logofs << "StaticCompressor: PANIC! Expected decompressed size was " - << plainSize << " while it is " << checkSize + << plainSize << " while it is " << checkSize << ".\n" << logofs_flush; #endif |