generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +01:00
Code Issues Projects Releases Wiki Activity

submitted 1.2.0

Browse Source
This commit is contained in:
Guenter Obiltschnig
2006-08-29 07:10:35 +00:00
parent f476bd6b32
commit 2d4078f392
1428 changed files with 25715 additions and 12456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Foundation/src/InflatingStream.cpp
View File

@@ -1,7 +1,7 @@
//
// InflatingStream.cpp
//
// $Id: //poco/1.1.0/Foundation/src/InflatingStream.cpp#2 $
// $Id: //poco/1.2/Foundation/src/InflatingStream.cpp#1 $
//
// Library: Foundation
// Package: Streams
@@ -34,11 +34,11 @@
//
#include "Foundation/InflatingStream.h"
#include "Foundation/Exception.h"
#include "Poco/InflatingStream.h"
#include "Poco/Exception.h"
Foundation_BEGIN
namespace Poco {
InflatingStreamBuf::InflatingStreamBuf(std::istream& istr, StreamType type):
@@ -114,7 +114,7 @@ int InflatingStreamBuf::readFromDevice(char* buffer, std::streamsize length)
{
if (_eof || !_pIstr) return 0;
if (!_zstr.next_in)
if (_zstr.avail_in == 0)
{
int n = 0;
if (_pIstr->good())
@@ -125,14 +125,9 @@ int InflatingStreamBuf::readFromDevice(char* buffer, std::streamsize length)
if (n == 0) return 0;
_zstr.next_in = (unsigned char*) _buffer;
_zstr.avail_in = n;
_zstr.next_out = (unsigned char*) buffer;
_zstr.avail_out = length;
}
else if (_zstr.avail_out == 0)
{
_zstr.next_out = (unsigned char*) buffer;
_zstr.avail_out = length;
}
_zstr.next_out = (unsigned char*) buffer;
_zstr.avail_out = length;
for (;;)
{
int rc = inflate(&_zstr, Z_NO_FLUSH);
@@ -255,4 +250,4 @@ InflatingInputStream::~InflatingInputStream()
}
Foundation_END
} // namespace Poco