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

Add class factories for filter streams. Also filters now follow the convention

Browse Source 
that they own their parent if they are created on a pointer to the parent.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-10-25 20:45:15 +00:00
parent 166c3ef0f9
commit 55420742a1
2 changed files with 142 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/wx/zstream.h
View File

@@ -39,6 +39,7 @@ enum {
class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
public:
wxZlibInputStream(wxInputStream& stream, int flags = wxZLIB_AUTO);
wxZlibInputStream(wxInputStream *stream, int flags = wxZLIB_AUTO);
virtual ~wxZlibInputStream();
char Peek() { return wxInputStream::Peek(); }
@@ -50,6 +51,9 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
size_t OnSysRead(void *buffer, size_t size);
wxFileOffset OnSysTell() const { return m_pos; }
private:
void Init(int flags);
protected:
size_t m_z_size;
unsigned char *m_z_buffer;
@@ -65,6 +69,7 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
public:
wxZlibOutputStream(wxOutputStream& stream, int level = -1, int flags = wxZLIB_ZLIB);
wxZlibOutputStream(wxOutputStream *stream, int level = -1, int flags = wxZLIB_ZLIB);
virtual ~wxZlibOutputStream() { Close(); }
void Sync() { DoFlush(false); }
@@ -79,6 +84,9 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
virtual void DoFlush(bool final);
private:
void Init(int level, int flags);
protected:
size_t m_z_size;
unsigned char *m_z_buffer;
@@ -88,6 +96,48 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
};
class WXDLLIMPEXP_BASE wxZlibClassFactory: public wxFilterClassFactory
{
public:
wxZlibClassFactory();
wxFilterInputStream *NewStream(wxInputStream& stream) const
{ return new wxZlibInputStream(stream); }
wxFilterOutputStream *NewStream(wxOutputStream& stream) const
{ return new wxZlibOutputStream(stream, -1); }
wxFilterInputStream *NewStream(wxInputStream *stream) const
{ return new wxZlibInputStream(stream); }
wxFilterOutputStream *NewStream(wxOutputStream *stream) const
{ return new wxZlibOutputStream(stream, -1); }
const wxChar * const *GetProtocols(wxStreamProtocolType type
= wxSTREAM_PROTOCOL) const;
private:
DECLARE_DYNAMIC_CLASS(wxZlibClassFactory)
};
class WXDLLIMPEXP_BASE wxGzipClassFactory: public wxFilterClassFactory
{
public:
wxGzipClassFactory();
wxFilterInputStream *NewStream(wxInputStream& stream) const
{ return new wxZlibInputStream(stream); }
wxFilterOutputStream *NewStream(wxOutputStream& stream) const
{ return new wxZlibOutputStream(stream, -1); }
wxFilterInputStream *NewStream(wxInputStream *stream) const
{ return new wxZlibInputStream(stream); }
wxFilterOutputStream *NewStream(wxOutputStream *stream) const
{ return new wxZlibOutputStream(stream, -1); }
const wxChar * const *GetProtocols(wxStreamProtocolType type
= wxSTREAM_PROTOCOL) const;
private:
DECLARE_DYNAMIC_CLASS(wxGzipClassFactory)
};
#endif
// wxUSE_ZLIB && wxUSE_STREAMS

93
src/common/zstream.cpp
View File

@@ -43,12 +43,89 @@ enum {
ZSTREAM_AUTO = 0x20 // auto detect between gzip and zlib
};
/////////////////////////////////////////////////////////////////////////////
// Zlib Class factory
IMPLEMENT_DYNAMIC_CLASS(wxZlibClassFactory, wxFilterClassFactory)
static wxZlibClassFactory g_wxZlibClassFactory;
wxZlibClassFactory::wxZlibClassFactory()
{
if (this == &g_wxZlibClassFactory)
PushFront();
}
const wxChar * const *
wxZlibClassFactory::GetProtocols(wxStreamProtocolType type) const
{
static const wxChar *mimes[] = { _T("application/x-deflate"), NULL };
static const wxChar *encs[] = { _T("deflate"), NULL };
static const wxChar *empty[] = { NULL };
switch (type) {
case wxSTREAM_MIMETYPE: return mimes;
case wxSTREAM_ENCODING: return encs;
default: return empty;
}
}
/////////////////////////////////////////////////////////////////////////////
// Gzip Class factory
IMPLEMENT_DYNAMIC_CLASS(wxGzipClassFactory, wxFilterClassFactory)
static wxGzipClassFactory g_wxGzipClassFactory;
wxGzipClassFactory::wxGzipClassFactory()
{
if (this == &g_wxGzipClassFactory && wxZlibInputStream::CanHandleGZip())
PushFront();
}
const wxChar * const *
wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const
{
static const wxChar *protos[] =
{ _T("gzip"), NULL };
static const wxChar *mimes[] =
{ _T("application/gzip"), _T("application/x-gzip"), NULL };
static const wxChar *encs[] =
{ _T("gzip"), NULL };
static const wxChar *exts[] =
{ _T(".gz"), _T(".gzip"), NULL };
static const wxChar *empty[] =
{ NULL };
switch (type) {
case wxSTREAM_PROTOCOL: return protos;
case wxSTREAM_MIMETYPE: return mimes;
case wxSTREAM_ENCODING: return encs;
case wxSTREAM_FILEEXTENSION: return exts;
default: return empty;
}
}
//////////////////////
// wxZlibInputStream
//////////////////////
wxZlibInputStream::wxZlibInputStream(wxInputStream& stream, int flags)
: wxFilterInputStream(stream)
{
Init(flags);
}
wxZlibInputStream::wxZlibInputStream(wxInputStream *stream, int flags)
: wxFilterInputStream(stream)
{
Init(flags);
}
void wxZlibInputStream::Init(int flags)
{
m_inflate = NULL;
m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
@@ -192,6 +269,19 @@ wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream,
int level,
int flags)
: wxFilterOutputStream(stream)
{
Init(level, flags);
}
wxZlibOutputStream::wxZlibOutputStream(wxOutputStream *stream,
int level,
int flags)
: wxFilterOutputStream(stream)
{
Init(level, flags);
}
void wxZlibOutputStream::Init(int level, int flags)
{
m_deflate = NULL;
m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
@@ -250,7 +340,8 @@ bool wxZlibOutputStream::Close()
m_deflate = NULL;
delete[] m_z_buffer;
m_z_buffer = NULL;
return IsOk();
return wxFilterOutputStream::Close() && IsOk();
}
void wxZlibOutputStream::DoFlush(bool final)