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

Fix return value of wxCountingOutputStream::LastWrite().

Browse Source 
Don't reuse m_lastcount in wxCountingOutputStream to store the stream length,
this doesn't make any sense and results in LastWrite() returning completely
wrong results as it expects m_lastcount to be the number of bytes written by
the last operation.

Add m_lastPos member to store the stream length instead.

Also correct wxCountingOutputStream documentation.

Closes #15215.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-05-20 13:15:26 +00:00
parent 0f5378d414
commit 9bc3af3e64
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/stream.cpp
View File

@@ -1117,22 +1117,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxCountingOutputStream, wxOutputStream)
wxCountingOutputStream::wxCountingOutputStream ()
{
m_currentPos = 0;
m_currentPos =
m_lastPos = 0;
}
wxFileOffset wxCountingOutputStream::GetLength() const
{
return m_lastcount;
return m_lastPos;
}
size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer),
size_t size)
{
m_currentPos += size;
if (m_currentPos > m_lastcount)
m_lastcount = m_currentPos;
if ( m_currentPos > m_lastPos )
m_lastPos = m_currentPos;
return m_currentPos;
return size;
}
wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
@@ -1146,12 +1147,12 @@ wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode
break;
case wxFromEnd:
new_pos = m_lastcount + new_pos;
wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_lastcount + pos), wxInvalidOffset, wxT("huge position not supported") );
new_pos += m_lastPos;
wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_lastPos + pos), wxInvalidOffset, wxT("huge position not supported") );
break;
case wxFromCurrent:
new_pos = m_currentPos + new_pos;
new_pos += m_currentPos;
wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_currentPos + pos), wxInvalidOffset, wxT("huge position not supported") );
break;
@@ -1162,8 +1163,8 @@ wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode
m_currentPos = new_pos;
if (m_currentPos > m_lastcount)
m_lastcount = m_currentPos;
if ( m_currentPos > m_lastPos )
m_lastPos = m_currentPos;
return m_currentPos;
}