Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apparently I didn't manage to put the class implementations in the matching 

source files.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34057 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-11-15 10:08:26 +00:00
parent d12b250c96
commit 7f03bc34fe
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/package/compression/ZlibCompressor.cpp
View File

@ -4,26 +4,26 @@
*/
#include "ZlibDecompressor.h"
#include "ZlibCompressor.h"
#include <errno.h>
#include <zlib.h>
ZlibDecompressor::ZlibDecompressor()
ZlibCompressor::ZlibCompressor()
{
}
ZlibDecompressor::~ZlibDecompressor()
ZlibCompressor::~ZlibCompressor()
{
}
status_t
ZlibDecompressor::Decompress(const void* input, size_t inputSize, void* output,
size_t outputSize, size_t& _uncompressedSize)
ZlibCompressor::Compress(const void* input, size_t inputSize, void* output,
size_t outputSize, size_t& _compressedSize)
{
if (inputSize == 0 || outputSize == 0)
return B_BAD_VALUE;
@ -46,14 +46,13 @@ ZlibDecompressor::Decompress(const void* input, size_t inputSize, void* output,
0 // reserved
};
int zlibError = inflateInit(&zStream);
int zlibError = deflateInit(&zStream, Z_BEST_COMPRESSION);
if (zlibError != Z_OK)
return TranslateZlibError(zlibError);
// deflate
status_t error = B_OK;
zlibError = inflate(&zStream, Z_FINISH);
zlibError = deflate(&zStream, Z_FINISH);
if (zlibError != Z_STREAM_END) {
if (zlibError == Z_OK)
error = B_BUFFER_OVERFLOW;
@ -62,13 +61,13 @@ ZlibDecompressor::Decompress(const void* input, size_t inputSize, void* output,
}
// clean up
zlibError = inflateEnd(&zStream);
zlibError = deflateEnd(&zStream);
if (zlibError != Z_OK && error == B_OK)
error = TranslateZlibError(zlibError);
if (error != B_OK)
return error;
_uncompressedSize = zStream.total_out;
_compressedSize = zStream.total_out;
return B_OK;
}

19
src/bin/package/compression/ZlibDecompressor.cpp
View File

@ -4,26 +4,26 @@
*/
#include "ZlibCompressor.h"
#include "ZlibDecompressor.h"
#include <errno.h>
#include <zlib.h>
ZlibCompressor::ZlibCompressor()
ZlibDecompressor::ZlibDecompressor()
{
}
ZlibCompressor::~ZlibCompressor()
ZlibDecompressor::~ZlibDecompressor()
{
}
status_t
ZlibCompressor::Compress(const void* input, size_t inputSize, void* output,
size_t outputSize, size_t& _compressedSize)
ZlibDecompressor::Decompress(const void* input, size_t inputSize, void* output,
size_t outputSize, size_t& _uncompressedSize)
{
if (inputSize == 0 || outputSize == 0)
return B_BAD_VALUE;
@ -46,13 +46,14 @@ ZlibCompressor::Compress(const void* input, size_t inputSize, void* output,
0 // reserved
};
int zlibError = deflateInit(&zStream, Z_BEST_COMPRESSION);
int zlibError = inflateInit(&zStream);
if (zlibError != Z_OK)
return TranslateZlibError(zlibError);
// deflate
status_t error = B_OK;
zlibError = deflate(&zStream, Z_FINISH);
zlibError = inflate(&zStream, Z_FINISH);
if (zlibError != Z_STREAM_END) {
if (zlibError == Z_OK)
error = B_BUFFER_OVERFLOW;
@ -61,13 +62,13 @@ ZlibCompressor::Compress(const void* input, size_t inputSize, void* output,
}
// clean up
zlibError = deflateEnd(&zStream);
zlibError = inflateEnd(&zStream);
if (zlibError != Z_OK && error == B_OK)
error = TranslateZlibError(zlibError);
if (error != B_OK)
return error;
_compressedSize = zStream.total_out;
_uncompressedSize = zStream.total_out;
return B_OK;
}