Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide ctors allowing to specify the non-default buffer size for buffered streams and wxStreamBuffer itself

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-10-29 16:42:45 +00:00
parent 187c2f81bc
commit f42c1512dd
3 changed files with 157 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/common/stream.cpp
View File

@@ -75,6 +75,16 @@ void wxStreamBuffer::Init()
m_fixed = true;
}
void wxStreamBuffer::InitWithStream(wxStreamBase& stream, BufMode mode)
{
Init();
m_stream = &stream;
m_mode = mode;
m_flushable = true;
}
wxStreamBuffer::wxStreamBuffer(BufMode mode)
{
Init();
@@ -85,16 +95,6 @@ wxStreamBuffer::wxStreamBuffer(BufMode mode)
m_flushable = false;
}
wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
{
Init();
m_stream = &stream;
m_mode = mode;
m_flushable = true;
}
wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)
{
// doing this has big chances to lead to a crash when the source buffer is
@@ -1204,21 +1204,33 @@ void wxFilterClassFactory::Remove()
// wxBufferedInputStream
// ----------------------------------------------------------------------------
wxBufferedInputStream::wxBufferedInputStream(wxInputStream& s,
wxStreamBuffer *buffer)
: wxFilterInputStream(s)
namespace
{
if ( buffer )
{
// use the buffer provided by the user
m_i_streambuf = buffer;
}
else // create a default buffer
{
m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
m_i_streambuf->SetBufferIO(1024);
}
// helper function used for initializing the buffer used by
// wxBufferedInput/OutputStream: it simply returns the provided buffer if it's
// not NULL or creates a buffer of the given size otherwise
template <typename T>
wxStreamBuffer *
CreateBufferIfNeeded(T& stream, wxStreamBuffer *buffer, size_t bufsize = 1024)
{
return buffer ? buffer : new wxStreamBuffer(stream, bufsize);
}
} // anonymous namespace
wxBufferedInputStream::wxBufferedInputStream(wxInputStream& stream,
wxStreamBuffer *buffer)
: wxFilterInputStream(stream)
{
m_i_streambuf = CreateBufferIfNeeded(*this, buffer);
}
wxBufferedInputStream::wxBufferedInputStream(wxInputStream& stream,
size_t bufsize)
: wxFilterInputStream(stream)
{
m_i_streambuf = CreateBufferIfNeeded(*this, NULL, bufsize);
}
wxBufferedInputStream::~wxBufferedInputStream()
@@ -1320,20 +1332,18 @@ void wxBufferedInputStream::SetInputStreamBuffer(wxStreamBuffer *buffer)
// wxBufferedOutputStream
// ----------------------------------------------------------------------------
wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& s,
wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& stream,
wxStreamBuffer *buffer)
: wxFilterOutputStream(s)
: wxFilterOutputStream(stream)
{
if ( buffer )
{
m_o_streambuf = buffer;
}
else // create a default one
{
m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
m_o_streambuf = CreateBufferIfNeeded(*this, buffer);
}
m_o_streambuf->SetBufferIO(1024);
}
wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& stream,
size_t bufsize)
: wxFilterOutputStream(stream)
{
m_o_streambuf = CreateBufferIfNeeded(*this, NULL, bufsize);
}
wxBufferedOutputStream::~wxBufferedOutputStream()