/*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
#include "serialization.h"
#include "util/serialize.h"
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(WIN32_NO_ZLIB_WINAPI)
#define ZLIB_WINAPI
#endif
#include "zlib.h"
}
}
-void compressZlib(SharedBuffer<u8> data, std::ostream &os)
+void compressZlib(SharedBuffer<u8> data, std::ostream &os, int level)
{
z_stream z;
const s32 bufsize = 16384;
- //char input_buffer[bufsize];
char output_buffer[bufsize];
- int input_i = 0;
int status = 0;
int ret;
z.zfree = Z_NULL;
z.opaque = Z_NULL;
- ret = deflateInit(&z, -1);
+ ret = deflateInit(&z, level);
if(ret != Z_OK)
throw SerializationError("compressZlib: deflateInit failed");
- z.avail_in = 0;
-
+ // Point zlib to our input buffer
+ z.next_in = (Bytef*)&data[0];
+ z.avail_in = data.getSize();
+ // And get all output
for(;;)
{
- int flush = Z_NO_FLUSH;
z.next_out = (Bytef*)output_buffer;
z.avail_out = bufsize;
-
- if(z.avail_in == 0)
- {
- //z.next_in = (char*)&data[input_i];
- z.next_in = (Bytef*)&data[input_i];
- z.avail_in = data.getSize() - input_i;
- input_i += z.avail_in;
- if(input_i == (int)data.getSize())
- flush = Z_FINISH;
- }
- if(z.avail_in == 0)
- break;
- status = deflate(&z, flush);
+
+ status = deflate(&z, Z_FINISH);
if(status == Z_NEED_DICT || status == Z_DATA_ERROR
|| status == Z_MEM_ERROR)
{
int count = bufsize - z.avail_out;
if(count)
os.write(output_buffer, count);
+ // This determines zlib has given all output
+ if(status == Z_STREAM_END)
+ break;
}
deflateEnd(&z);
-
}
-void compressZlib(const std::string &data, std::ostream &os)
+void compressZlib(const std::string &data, std::ostream &os, int level)
{
SharedBuffer<u8> databuf((u8*)data.c_str(), data.size());
- compressZlib(databuf, os);
+ compressZlib(databuf, os, level);
}
void decompressZlib(std::istream &is, std::ostream &os)
if(z.avail_in == 0)
{
z.next_in = (Bytef*)input_buffer;
- input_buffer_len = is.readsome(input_buffer, bufsize);
+ is.read(input_buffer, bufsize);
+ input_buffer_len = is.gcount();
z.avail_in = input_buffer_len;
//dstream<<"read fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
}
//dstream<<"z.avail_in="<<z.avail_in<<std::endl;
//dstream<<"fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
// Unget all the data that inflate didn't take
+ is.clear(); // Just in case EOF is set
for(u32 i=0; i < z.avail_in; i++)
{
is.unget();