added wxStreamBuffer::Truncate() (patch 1687081)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 5805088ffbef1d1b688b8db7e3f6fab3f8c99922..3258b885d66dfd062e9755ad5df1c3c428afd6a2 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -81,6 +81,7 @@ All:
 - Implemented wxMemoryInputStream::CanRead()
 - Added wxEXEC_BLOCK flag (Hank Schultz)
 - Add support for wxStream-derived classes to wxRTTI (Stas Sergeev)
 - Implemented wxMemoryInputStream::CanRead()
 - Added wxEXEC_BLOCK flag (Hank Schultz)
 - Add support for wxStream-derived classes to wxRTTI (Stas Sergeev)

+- Added wxStreamBuffer::Truncate() (Stas Sergeev)

 
 All (GUI):
 
 
 All (GUI):
 

diff --git a/docs/latex/wx/stream.tex b/docs/latex/wx/stream.tex
index 9ff128a6ed7c4cbfd544c1e1a728bc8d2b27059a..9262f10486575085579ed4ce8bc5e066e8a69b72 100644 (file)
--- a/docs/latex/wx/stream.tex
+++ b/docs/latex/wx/stream.tex
@@ -184,6 +184,17 @@ the beginning of the stream. Otherwise, it returns wxInvalidOffset.
 
 Resets to the initial state variables concerning the buffer.
 
 
 Resets to the initial state variables concerning the buffer.
 

+
+\membersection{wxStreamBuffer::Truncate}\label{wxstreambuffertruncate}
+
+\func{void}{Truncate}{\void}
+
+Truncates the buffer to the current position.
+
+Note: Truncate() cannot be used to enlarge the buffer. This is
+usually not needed since the buffer expands automatically.
+
+

 \membersection{wxStreamBuffer::SetBufferIO}\label{wxstreambuffersetbufferio}
 
 \func{void}{SetBufferIO}{\param{char*}{ buffer\_start}, \param{char*}{ buffer\_end}}
 \membersection{wxStreamBuffer::SetBufferIO}\label{wxstreambuffersetbufferio}
 
 \func{void}{SetBufferIO}{\param{char*}{ buffer\_start}, \param{char*}{ buffer\_end}}

diff --git a/include/wx/stream.h b/include/wx/stream.h
index f0c1ce170cc51138b5f080978f6e07fd2a5914bc..5ef6ccdc4bd5f43eb0d0f1b6be02d5d00598196a 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -434,6 +434,7 @@ public:
 
     // Buffer control
     void ResetBuffer();
 
     // Buffer control
     void ResetBuffer();

+    void Truncate();

 
     // NB: the buffer must always be allocated with malloc() if takeOwn is
     //     true as it will be deallocated by free()
 
     // NB: the buffer must always be allocated with malloc() if takeOwn is
     //     true as it will be deallocated by free()

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 1f1c94c688b47d7365712ad0ba27788ba7e5604b..e3d076ad77bb450d968d47dd8f446222ea6dac3d 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -192,6 +192,28 @@ void wxStreamBuffer::ResetBuffer()
                         : m_buffer_start;
 }
 
                         : m_buffer_start;
 }
 

+void wxStreamBuffer::Truncate()
+{
+    size_t new_size = m_buffer_pos - m_buffer_start;
+    if ( new_size == m_buffer_size )
+        return;
+
+    if ( !new_size )
+    {
+        FreeBuffer();
+        InitBuffer();
+        return;
+    }
+
+    char *new_start = (char *)realloc(m_buffer_start, new_size);
+    wxCHECK_RET( new_size, _T("shrinking buffer shouldn't fail") );
+
+    m_buffer_start = new_start;
+    m_buffer_size = new_size;
+    m_buffer_end = m_buffer_start + m_buffer_size;
+    m_buffer_pos = m_buffer_end;
+}
+

 // fill the buffer with as much data as possible (only for read buffers)
 bool wxStreamBuffer::FillBuffer()
 {
 // fill the buffer with as much data as possible (only for read buffers)
 bool wxStreamBuffer::FillBuffer()
 {