X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fzlibcompressed.cpp;h=2220bcc46f063372698915a95e1ad1a45d1f74f0;hp=99ae7f81f8845016e73e92d60f13083e7e672ee6;hb=20c897ece781e18ba54c41fd68e232ce566a938d;hpb=481b844ed7d180ffbf70223075f2fc1ffdb5b444

diff --git a/source/io/zlibcompressed.cpp b/source/io/zlibcompressed.cpp
index 99ae7f8..2220bcc 100644
--- a/source/io/zlibcompressed.cpp
+++ b/source/io/zlibcompressed.cpp
@@ -8,7 +8,7 @@ using namespace std;
 namespace Msp {
 namespace IO {
 
-zlib_error::zlib_error(const std::string &w, int c):
+zlib_error::zlib_error(const string &w, int c):
 #ifdef WITH_ZLIB
 	runtime_error(w+": "+zError(c)),
 #else
@@ -118,6 +118,11 @@ void ZlibCompressed::set_block(bool)
 	throw logic_error("ZlibCompressed::set_block");
 }
 
+void ZlibCompressed::set_inherit(bool)
+{
+	throw logic_error("ZlibCompressed::set_inherit");
+}
+
 void ZlibCompressed::flush()
 {
 #ifdef WITH_ZLIB
@@ -136,15 +141,15 @@ void ZlibCompressed::flush()
 #endif
 }
 
-unsigned ZlibCompressed::do_write(const char *data, unsigned size)
+size_t ZlibCompressed::do_write(const char *data, size_t size)
 {
 	check_access(M_WRITE);
 
-	unsigned processed = 0;
+	size_t processed = 0;
 #ifdef WITH_ZLIB
 	while(processed<size)
 	{
-		unsigned free_in = (in_buffer+buffer_size-priv->stream.next_in);
+		size_t free_in = (in_buffer+buffer_size-priv->stream.next_in);
 		if(free_in<size && priv->stream.next_in>in_buffer)
 		{
 			// Not all of the data fits in the buffer, so make some more room
@@ -156,7 +161,7 @@ unsigned ZlibCompressed::do_write(const char *data, unsigned size)
 		if(free_in)
 		{
 			// Copy as much data into the input buffer as possible
-			unsigned len = min(free_in, size-processed);
+			size_t len = min(free_in, size-processed);
 			copy(data+processed, data+processed+len, priv->stream.next_in+priv->stream.avail_in);
 			priv->stream.avail_in += len;
 			processed += len;
@@ -191,12 +196,12 @@ bool ZlibCompressed::compress_data(int flush_mode)
 	}
 
 	// Write compressed data into the underlying object
-	unsigned len = 0;
+	size_t len = 0;
 	if(priv->stream.next_out>out_buffer)
 		len = below.write(reinterpret_cast<char *>(out_buffer), priv->stream.next_out-out_buffer);
 	if(len>0)
 	{
-		if(len<static_cast<unsigned>(priv->stream.next_out-out_buffer))
+		if(len<static_cast<size_t>(priv->stream.next_out-out_buffer))
 			copy(out_buffer+len, priv->stream.next_out, out_buffer);
 		priv->stream.avail_out += len;
 		priv->stream.next_out -= len;
@@ -212,23 +217,23 @@ bool ZlibCompressed::compress_data(int flush_mode)
 #endif
 }
 
-unsigned ZlibCompressed::do_read(char *data, unsigned size)
+size_t ZlibCompressed::do_read(char *data, size_t size)
 {
 	check_access(M_READ);
 
-	unsigned processed = 0;
+	size_t processed = 0;
 #ifdef WITH_ZLIB
 	while(processed<size)
 	{
 		if(priv->stream.next_out>out_buffer)
 		{
 			// We have some pending output, give it out first
-			unsigned len = min<unsigned>(priv->stream.next_out-out_buffer, size-processed);
+			size_t len = min<size_t>(priv->stream.next_out-out_buffer, size-processed);
 
 			copy(out_buffer, out_buffer+len, data+processed);
 			processed += len;
 
-			if(len<static_cast<unsigned>(priv->stream.next_out-out_buffer))
+			if(len<static_cast<size_t>(priv->stream.next_out-out_buffer))
 				copy(out_buffer+len, priv->stream.next_out, out_buffer);
 			priv->stream.next_out -= len;
 			priv->stream.avail_out += len;
@@ -256,7 +261,7 @@ unsigned ZlibCompressed::do_read(char *data, unsigned size)
 				copy(priv->stream.next_in, priv->stream.next_in+priv->stream.avail_in, in_buffer);
 			priv->stream.next_in = in_buffer;
 
-			unsigned len = below.read(reinterpret_cast<char *>(priv->stream.next_in), in_buffer+buffer_size-priv->stream.next_in);
+			size_t len = below.read(reinterpret_cast<char *>(priv->stream.next_in), in_buffer+buffer_size-priv->stream.next_in);
 			priv->stream.avail_in += len;
 			if(!len && below.eof())
 				stream_end = true;