X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3f4609ebb56f76065c28352d8db37f65a6fa35e..fa1c12bdd76acc21ddb45b90bb53b2f58aed946d:/src/common/fs_mem.cpp diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp index 4f8f84d4eb..2bfcfd02be 100644 --- a/src/common/fs_mem.cpp +++ b/src/common/fs_mem.cpp @@ -20,7 +20,9 @@ #if wxUSE_FILESYSTEM && wxUSE_STREAMS #ifndef WXPRECOMP -#include "wx/wx.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/hash.h" #endif #include "wx/filesys.h" @@ -30,7 +32,7 @@ class MemFSHashObj : public wxObject { public: - + MemFSHashObj(const void *data, size_t len) { m_Data = new char[len]; @@ -38,7 +40,7 @@ class MemFSHashObj : public wxObject m_Len = len; m_Time = wxDateTime::Now(); } - + MemFSHashObj(wxMemoryOutputStream& stream) { m_Len = stream.GetSize(); @@ -46,12 +48,12 @@ class MemFSHashObj : public wxObject stream.CopyTo(m_Data, m_Len); m_Time = wxDateTime::Now(); } - + ~MemFSHashObj() { delete[] m_Data; } - + char *m_Data; size_t m_Len; wxDateTime m_Time; @@ -78,8 +80,8 @@ wxMemoryFSHandler::~wxMemoryFSHandler() // as only one copy of FS handler is supposed to exist, we may silently // delete static data here. (There is no way how to remove FS handler from // wxFileSystem other than releasing _all_ handlers.) - - if (m_Hash) delete m_Hash; + + if (m_Hash) delete m_Hash; m_Hash = NULL; } @@ -131,12 +133,12 @@ wxString wxMemoryFSHandler::FindNext() bool wxMemoryFSHandler::CheckHash(const wxString& filename) { - if (m_Hash == NULL) + if (m_Hash == NULL) { m_Hash = new wxHashTable(wxKEY_STRING); m_Hash -> DeleteContents(TRUE); } - + if (m_Hash -> Get(filename) != NULL) { wxString s; @@ -156,7 +158,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename) { if (!CheckHash(filename)) return; - + wxMemoryOutputStream mems; if (image.Ok() && image.SaveFile(mems, (int)type)) m_Hash -> Put(filename, new MemFSHashObj(mems));