Added support for reading image resolutions from PNG images.

[wxWidgets.git] / src / common / txtstrm.cpp

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 010fe739f644263c97a91860e9882bd59c6e2c86..94083459604484ffd4c4ce691548884a31ce56a6 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -18,22 +18,14 @@
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

+#include "wx/txtstrm.h"
+

 #ifndef WX_PRECOMP
     #include "wx/crt.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/crt.h"
 #endif
 

-#include "wx/txtstrm.h"

 #include <ctype.h>
 
 #include <ctype.h>
 

-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// Unix: "\n"
-// Dos:  "\r\n"
-// Mac:  "\r"
-

 // ----------------------------------------------------------------------------
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTextInputStream
 // ----------------------------------------------------------------------------


@@ -77,25 +69,43 @@ wxChar wxTextInputStream::NextChar()
     memset((void*)m_lastBytes, 0, 10);
     for(size_t inlen = 0; inlen < 9; inlen++)
     {
     memset((void*)m_lastBytes, 0, 10);
     for(size_t inlen = 0; inlen < 9; inlen++)
     {

-        if (!m_input.CanRead())
-            return wxEOT;
-

         // actually read the next character
         m_lastBytes[inlen] = m_input.GetC();
 
         if(m_input.LastRead() <= 0)
             return wxEOT;
 
         // actually read the next character
         m_lastBytes[inlen] = m_input.GetC();
 
         if(m_input.LastRead() <= 0)
             return wxEOT;
 

-        if ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1)
-                != wxCONV_FAILED )
-            return wbuf[0];
+        switch ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1) )
+        {
+            case 0:
+                // this is a bug in converter object as it should either fail
+                // or decode non-empty string to something non-empty
+                wxFAIL_MSG("ToWChar() can't return 0 for non-empty input");
+                break;
+
+            case wxCONV_FAILED:
+                // the buffer probably doesn't contain enough bytes to decode
+                // as a complete character, try with more bytes
+                break;
+
+            default:
+                // if we couldn't decode a single character during the last
+                // loop iteration we shouldn't be able to decode 2 or more of
+                // them with an extra single byte, something fishy is going on
+                wxFAIL_MSG("unexpected decoding result");
+                // fall through nevertheless and return at least something
+
+            case 1:
+                // we finally decoded a character
+                return wbuf[0];
+        }

     }
     }

-    // there should be no encoding which requires more than nine bytes for one character...
+
+    // there should be no encoding which requires more than nine bytes for one
+    // character so something must be wrong with our conversion but we have no
+    // way to signal it from here

     return wxEOT;
 #else
     return wxEOT;
 #else

-    if (!m_input.CanRead())
-        return wxEOT;
-

     m_lastBytes[0] = m_input.GetC();
 
     if(m_input.LastRead() <= 0)
     m_lastBytes[0] = m_input.GetC();
 
     if(m_input.LastRead() <= 0)


@@ -115,7 +125,7 @@ wxChar wxTextInputStream::NextNonSeparators()
 
         if (c != wxT('\n') &&
             c != wxT('\r') &&
 
         if (c != wxT('\n') &&
             c != wxT('\r') &&

-            !m_separators.Contains(c))
+            m_separators.Find(c) < 0)

           return c;
     }
 
           return c;
     }
 


@@ -139,7 +149,7 @@ bool wxTextInputStream::EatEOL(const wxChar &c)
 
 wxUint32 wxTextInputStream::Read32(int base)
 {
 
 wxUint32 wxTextInputStream::Read32(int base)
 {

-    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );

     if(!m_input) return 0;
 
     wxString word = ReadWord();
     if(!m_input) return 0;
 
     wxString word = ReadWord();


@@ -160,7 +170,7 @@ wxUint8 wxTextInputStream::Read8(int base)
 
 wxInt32 wxTextInputStream::Read32S(int base)
 {
 
 wxInt32 wxTextInputStream::Read32S(int base)
 {

-    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );

     if(!m_input) return 0;
 
     wxString word = ReadWord();
     if(!m_input) return 0;
 
     wxString word = ReadWord();


@@ -235,7 +245,7 @@ wxString wxTextInputStream::ReadWord()
         if(c == wxEOT)
             break;
 
         if(c == wxEOT)
             break;
 

-        if (m_separators.Contains(c))
+        if (m_separators.Find(c) >= 0)

             break;
 
         if (EatEOL(c))
             break;
 
         if (EatEOL(c))


@@ -328,8 +338,6 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;

 #else
         m_mode = wxEOL_UNIX;
 #endif
 #else
         m_mode = wxEOL_UNIX;
 #endif


@@ -350,8 +358,6 @@ void wxTextOutputStream::SetMode(wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;

 #else
         m_mode = wxEOL_UNIX;
 #endif
 #else
         m_mode = wxEOL_UNIX;
 #endif


@@ -405,15 +411,15 @@ void wxTextOutputStream::WriteString(const wxString& string)
             switch ( m_mode )
             {
                 case wxEOL_DOS:
             switch ( m_mode )
             {
                 case wxEOL_DOS:

-                    out << _T("\r\n");
+                    out << wxT("\r\n");

                     continue;
 
                 case wxEOL_MAC:
                     continue;
 
                 case wxEOL_MAC:

-                    out << _T('\r');
+                    out << wxT('\r');

                     continue;
 
                 default:
                     continue;
 
                 default:

-                    wxFAIL_MSG( _T("unknown EOL mode in wxTextOutputStream") );
+                    wxFAIL_MSG( wxT("unknown EOL mode in wxTextOutputStream") );

                     // fall through
 
                 case wxEOL_UNIX:
                     // fall through
 
                 case wxEOL_UNIX:


@@ -444,6 +450,19 @@ wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
     return *this;
 }
 
     return *this;
 }
 

+void wxTextOutputStream::Flush()
+{
+#if wxUSE_UNICODE
+    const size_t len = m_conv->FromWChar(NULL, 0, L"", 1);
+    if ( len > m_conv->GetMBNulLen() )
+    {
+        wxCharBuffer buf(len);
+        m_conv->FromWChar(buf.data(), len, L"", 1);
+        m_output.Write(buf, len - m_conv->GetMBNulLen());
+    }
+#endif // wxUSE_UNICODE
+}
+

 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {
     WriteString( string );
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {
     WriteString( string );