X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..30d6c59b297f98ebda1d6c14e56f289bd3b02799:/src/html/htmlfilt.cpp?ds=sidebyside
diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 3fba50c992..0baea69675 100644
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: htmlfilt.cpp
+// Name: src/html/htmlfilt.cpp
// Purpose: wxHtmlFilter - input filter for translating into HTML format
// Author: Vaclav Slavik
// RCS-ID: $Id$
@@ -7,57 +7,31 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "htmlfilt.h"
-#endif
-
#include "wx/wxprec.h"
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/intl.h"
#endif
#include "wx/strconv.h"
+#include "wx/sstream.h"
#include "wx/html/htmlfilt.h"
#include "wx/html/htmlwin.h"
-// utility function: read a wxString from a wxInputStream
+// utility function: read entire contents of an wxInputStream into a wxString
+//
+// TODO: error handling?
static void ReadString(wxString& str, wxInputStream* s, wxMBConv& conv)
{
- size_t streamSize = s->GetSize();
-
- if (streamSize == ~(size_t)0)
- {
- const size_t bufSize = 4095;
- char buffer[bufSize+1];
- size_t lastRead;
-
- do
- {
- s->Read(buffer, bufSize);
- lastRead = s->LastRead();
- buffer[lastRead] = 0;
- str.Append(wxString(buffer, conv));
- }
- while (lastRead == bufSize);
- }
- else
- {
- char* src = new char[streamSize+1];
- s->Read(src, streamSize);
- src[streamSize] = 0;
- str = wxString(src, conv);
- delete[] src;
- }
+ wxStringOutputStream out(&str, conv);
+ s->Read(out);
}
/*
@@ -77,7 +51,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter)
bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const
{
- return TRUE;
+ return true;
}
@@ -90,9 +64,9 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const
if (s == NULL) return wxEmptyString;
ReadString(doc, s, wxConvISO8859_1);
- doc.Replace(wxT("&"), wxT("&"), TRUE);
- doc.Replace(wxT("<"), wxT("<"), TRUE);
- doc.Replace(wxT(">"), wxT(">"), TRUE);
+ doc.Replace(wxT("&"), wxT("&"), true);
+ doc.Replace(wxT("<"), wxT("<"), true);
+ doc.Replace(wxT(">"), wxT(">"), true);
doc2 = wxT("\n") + doc + wxT("\n");
return doc2;
}
@@ -165,13 +139,13 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
return wxEmptyString;
}
- // NB: We convert input file to wchar_t here in Unicode mode, based on
+ // NB: We convert input file to wchar_t here in Unicode mode, based on
// either Content-Type header or tags. In ANSI mode, we don't
// do it as it is done by wxHtmlParser (for this reason, we add
// tag if we used Content-Type header).
#if wxUSE_UNICODE
- int charsetPos;
- if ((charsetPos = file.GetMimeType().Find(_T("; charset="))) != wxNOT_FOUND)
+ int charsetPos;
+ if ((charsetPos = file.GetMimeType().Find(wxT("; charset="))) != wxNOT_FOUND)
{
wxString charset = file.GetMimeType().Mid(charsetPos + 10);
wxCSConv conv(charset);
@@ -179,15 +153,19 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
}
else
{
- wxString tmpdoc;
- ReadString(tmpdoc, s, wxConvISO8859_1);
+ size_t size = s->GetSize();
+ wxCharBuffer buf( size+1 );
+ s->Read( buf.data(), size );
+ *(buf.data() + size) = 0;
+ wxString tmpdoc( buf, wxConvISO8859_1);
+
wxString charset = wxHtmlParser::ExtractCharsetInformation(tmpdoc);
if (charset.empty())
doc = tmpdoc;
else
{
wxCSConv conv(charset);
- doc = wxString(tmpdoc.mb_str(wxConvISO8859_1), conv);
+ doc = wxString( buf, conv );
}
}
#else // !wxUSE_UNICODE
@@ -197,7 +175,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
{
wxString hdr;
wxString mime = file.GetMimeType();
- hdr.Printf(_T(""), mime.c_str());
+ hdr.Printf(wxT(""), mime.c_str());
return hdr+doc;
}
#endif
@@ -219,7 +197,7 @@ class wxHtmlFilterModule : public wxModule
{
wxHtmlWindow::AddFilter(new wxHtmlFilterHTML);
wxHtmlWindow::AddFilter(new wxHtmlFilterImage);
- return TRUE;
+ return true;
}
virtual void OnExit() {}
};