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 *mimes[] = { wxT("application/x-deflate"), NULL };
+ static const wxChar *encs[] = { wxT("deflate"), NULL };
static const wxChar *empty[] = { NULL };
switch (type) {
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 *protos[] =
+ { wxT("gzip"), NULL };
+ static const wxChar *mimes[] =
+ { wxT("application/gzip"), wxT("application/x-gzip"), NULL };
+ static const wxChar *encs[] =
+ { wxT("gzip"), NULL };
+ static const wxChar *exts[] =
+ { wxT(".gz"), wxT(".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;
+ case wxSTREAM_PROTOCOL: return protos;
+ case wxSTREAM_MIMETYPE: return mimes;
+ case wxSTREAM_ENCODING: return encs;
+ case wxSTREAM_FILEEXT: return exts;
+ default: return empty;
}
}
m_z_size = ZSTREAM_BUFFER_SIZE;
m_pos = 0;
-#if WXWIN_COMPATIBILITY_2_4
- // treat compatibility mode as auto
- m_24compatibilty = flags == wxZLIB_24COMPATIBLE;
- if (m_24compatibilty)
- flags = wxZLIB_AUTO;
-#endif
-
// if gzip is asked for but not supported...
if ((flags == wxZLIB_GZIP || flags == wxZLIB_AUTO) && !CanHandleGZip()) {
if (flags == wxZLIB_AUTO) {
// by the parent strean,
m_lasterror = wxSTREAM_READ_ERROR;
if (m_parent_i_stream->Eof())
-#if WXWIN_COMPATIBILITY_2_4
- if (m_24compatibilty)
- m_lasterror = wxSTREAM_EOF;
- else
-#endif
+ {
wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
+ }
break;
default:
return major > 1 || (major == 1 && minor >= 2);
}
+bool wxZlibInputStream::SetDictionary(const char *data, const size_t datalen)
+{
+ return (inflateSetDictionary(m_inflate, (Bytef*)data, datalen) == Z_OK);
+}
+
+bool wxZlibInputStream::SetDictionary(const wxMemoryBuffer &buf)
+{
+ return SetDictionary((char*)buf.GetData(), buf.GetDataLen());
+}
+
//////////////////////
// wxZlibOutputStream
return wxZlibInputStream::CanHandleGZip();
}
+bool wxZlibOutputStream::SetDictionary(const char *data, const size_t datalen)
+{
+ return (deflateSetDictionary(m_deflate, (Bytef*)data, datalen) == Z_OK);
+}
+
+bool wxZlibOutputStream::SetDictionary(const wxMemoryBuffer &buf)
+{
+ return SetDictionary((char*)buf.GetData(), buf.GetDataLen());
+}
+
#endif
// wxUSE_ZLIB && wxUSE_STREAMS