From 7f03bc34fe55336b3d8fc49078b9d4ad1cc13d8f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 15 Nov 2009 10:08:26 +0000 Subject: [PATCH] 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 --- .../package/compression/ZlibCompressor.cpp | 19 +++++++++---------- .../package/compression/ZlibDecompressor.cpp | 19 ++++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/bin/package/compression/ZlibCompressor.cpp b/src/bin/package/compression/ZlibCompressor.cpp index 2da9423095..26f7715b24 100644 --- a/src/bin/package/compression/ZlibCompressor.cpp +++ b/src/bin/package/compression/ZlibCompressor.cpp @@ -4,26 +4,26 @@ */ -#include "ZlibDecompressor.h" +#include "ZlibCompressor.h" #include #include -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; } diff --git a/src/bin/package/compression/ZlibDecompressor.cpp b/src/bin/package/compression/ZlibDecompressor.cpp index 26f7715b24..2da9423095 100644 --- a/src/bin/package/compression/ZlibDecompressor.cpp +++ b/src/bin/package/compression/ZlibDecompressor.cpp @@ -4,26 +4,26 @@ */ -#include "ZlibCompressor.h" +#include "ZlibDecompressor.h" #include #include -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; }