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

* wxStream fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-08-24 17:22:31 +00:00
parent 4128681253
commit 885ee23543
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/fstream.cpp
View File

@@ -44,10 +44,7 @@ char wxFileInputStream::Peek()
size_t wxFileInputStream::DoRead(void *buffer, size_t size) size_t wxFileInputStream::DoRead(void *buffer, size_t size)
{ {
size_t ret = wxFile::Read(buffer, size); return wxFile::Read(buffer, size);
m_eof = wxFile::Eof();
return ret;
} }
off_t wxFileInputStream::DoSeekInput(off_t pos, wxSeekMode mode) off_t wxFileInputStream::DoSeekInput(off_t pos, wxSeekMode mode)

46
src/common/stream.cpp
View File

@@ -59,31 +59,37 @@ void wxStreamBuffer::WriteBack(char c)
void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end) void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end)
{ {
m_buffer_pos = m_buffer_start = buffer_start; size_t ret;
m_buffer_end = buffer_end;
m_buffer_start = buffer_start;
m_buffer_end = buffer_end;
m_buffer_size = m_buffer_end-m_buffer_start; m_buffer_size = m_buffer_end-m_buffer_start;
if (m_istream) {
ret = m_istream->DoRead(m_buffer_start, m_buffer_size);
m_buffer_end = m_buffer_start + ret;
}
m_buffer_pos = m_buffer_start;
} }
void wxStreamBuffer::SetBufferIO(size_t bufsize) void wxStreamBuffer::SetBufferIO(size_t bufsize)
{ {
if (m_buffer_start) char *b_start;
delete[] m_buffer_start;
wxDELETE(m_buffer_start);
if (!bufsize) { if (!bufsize) {
m_buffer_start = NULL; m_buffer_start = NULL;
m_buffer_end = NULL; m_buffer_end = NULL;
m_buffer_pos = NULL; m_buffer_pos = NULL;
m_buffer_size = 0; m_buffer_size = 0;
return;
} }
m_buffer_start = new char[bufsize]; b_start = new char[bufsize];
m_buffer_end = m_buffer_start + bufsize;
if (m_istream) SetBufferIO(b_start, b_start + bufsize);
m_buffer_pos = m_buffer_end;
else
m_buffer_pos = m_buffer_start;
m_buffer_size = bufsize;
} }
void wxStreamBuffer::ResetBuffer() void wxStreamBuffer::ResetBuffer()
@@ -125,9 +131,10 @@ void wxStreamBuffer::Read(void *buffer, size_t size)
read_ret = m_istream->DoRead(m_buffer_start, m_buffer_size); read_ret = m_istream->DoRead(m_buffer_start, m_buffer_size);
// Read failed // Read failed: EOF
if (read_ret == 0) { if (read_ret == 0) {
m_istream->m_lastread = orig_size-size; m_istream->m_lastread = orig_size-size;
m_istream->m_eof = TRUE;
m_buffer_pos = m_buffer_end = m_buffer_start; m_buffer_pos = m_buffer_end = m_buffer_start;
return; return;
} else { } else {
@@ -361,25 +368,30 @@ wxInputStream& wxInputStream::operator>>(wxObject *& obj)
off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode) off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
{ {
off_t ret_off; off_t ret_off, diff, last_access;
last_access = m_i_streambuf->GetLastAccess();
switch (mode) { switch (mode) {
case wxFromStart: case wxFromStart:
if ( (unsigned)abs (DoTellInput()-pos) > m_i_streambuf->GetLastAccess() ) { diff = DoTellInput() - pos;
if ( diff < 0 || diff > last_access ) {
ret_off = DoSeekInput(pos, wxFromStart); ret_off = DoSeekInput(pos, wxFromStart);
m_i_streambuf->ResetBuffer(); m_i_streambuf->ResetBuffer();
return ret_off; return ret_off;
} else { } else {
m_i_streambuf->SetIntPosition(DoTellInput() - pos); m_i_streambuf->SetIntPosition(last_access - diff);
return pos; return pos;
} }
case wxFromCurrent: case wxFromCurrent:
if ( ((unsigned)pos > m_i_streambuf->GetLastAccess()) || (pos < 0) ) { diff = pos + m_i_streambuf->GetIntPosition();
if ( (diff > last_access) || (diff < 0) ) {
ret_off = DoSeekInput(pos, wxFromCurrent); ret_off = DoSeekInput(pos, wxFromCurrent);
m_i_streambuf->ResetBuffer(); m_i_streambuf->ResetBuffer();
return ret_off; return ret_off;
} else { } else {
m_i_streambuf->SetIntPosition(pos); m_i_streambuf->SetIntPosition(diff);
return pos; return pos;
} }
case wxFromEnd: case wxFromEnd: