Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 07:13:49 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into wx3 is necessary,

Browse Source
This commit is contained in:
Leland Lucius
2015-07-11 19:23:49 -05:00
parent c6dffaaaa4 7d3e4a16d6
commit a9184af222
7 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/AutoRecovery.cpp
View File

@@ -457,7 +457,7 @@ void AutoSaveFile::WriteAttr(const wxString & name, const wxString & value)
mBuffer.PutC(FT_String);
WriteName(name);
short len = value.Length() * sizeof(wxChar);
int len = value.Length() * sizeof(wxChar);
mBuffer.Write(&len, sizeof(len));
mBuffer.Write(value.wx_str(), len);
@@ -525,7 +525,7 @@ void AutoSaveFile::WriteData(const wxString & value)
{
mBuffer.PutC(FT_Data);
short len = value.Length() * sizeof(wxChar);
int len = value.Length() * sizeof(wxChar);
mBuffer.Write(&len, sizeof(len));
mBuffer.Write(value.wx_str(), len);
@@ -535,7 +535,7 @@ void AutoSaveFile::Write(const wxString & value)
{
mBuffer.PutC(FT_Raw);
short len = value.Length() * sizeof(wxChar);
int len = value.Length() * sizeof(wxChar);
mBuffer.Write(&len, sizeof(len));
mBuffer.Write(value.wx_str(), len);
@@ -595,6 +595,7 @@ void AutoSaveFile::CheckSpace(wxMemoryOutputStream & os)
void AutoSaveFile::WriteName(const wxString & name)
{
wxASSERT(name.Length() * sizeof(wxChar) <= SHRT_MAX);
short len = name.Length() * sizeof(wxChar);
short id;
@@ -770,7 +771,7 @@ bool AutoSaveFile::Decode(const wxString & fileName)
case FT_String:
{
short len;
int len;
in.Read(&id, sizeof(id));
in.Read(&len, sizeof(len));
@@ -865,7 +866,7 @@ bool AutoSaveFile::Decode(const wxString & fileName)
case FT_Data:
{
short len;
int len;
in.Read(&len, sizeof(len));
wxChar *val = new wxChar[len / sizeof(wxChar)];
@@ -878,7 +879,7 @@ bool AutoSaveFile::Decode(const wxString & fileName)
case FT_Raw:
{
short len;
int len;
in.Read(&len, sizeof(len));
wxChar *val = new wxChar[len / sizeof(wxChar)];