]> git.saurik.com Git - wxWidgets.git/commitdiff
Avoid needless second string conversion when adding files to memory FS.
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 18 Jan 2012 19:42:58 +0000 (19:42 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 18 Jan 2012 19:42:58 +0000 (19:42 +0000)
Create the buffer holding the result of conversion instead of converting
twice, once to only get the length of the result and the second time to get
the data.

Closes #13877.

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

src/common/fs_mem.cpp

index e306437de465ee11be4fbde3186805ad3ee035e0..5f96257100180f37ed3a5b1f55a4ed56d245f010 100644 (file)
@@ -186,13 +186,9 @@ void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
                                                 const wxString& textdata,
                                                 const wxString& mimetype)
 {
-    AddFileWithMimeType
-    (
-        filename,
-        static_cast<const char *>(textdata.To8BitData()),
-        wxStrlen(static_cast<const char *>(textdata.To8BitData())),
-        mimetype
-    );
+    const wxCharBuffer buf(textdata.To8BitData());
+
+    AddFileWithMimeType(filename, buf.data(), buf.length(), mimetype);
 }