diff options
| author | David Srbecky <dsrbecky@google.com> | 2015-05-11 12:31:23 +0100 |
|---|---|---|
| committer | David Srbecky <dsrbecky@google.com> | 2015-05-13 01:06:58 +0100 |
| commit | cd66d540cead3f8200b0c73bad9c276d67896c3d (patch) | |
| tree | d25a4a409bd041f18b856e156cf1fa71f6169369 /CPP/Common/StringConvert.h | |
| parent | b473eaa2840cccf2fef15d53f00bccf92c41b615 (diff) | |
| download | lzma-cd66d540cead3f8200b0c73bad9c276d67896c3d.tar.gz | |
Updated LZMA SDK to 9.38 beta.
The webpage says "If you use XZ code from LZMA SDK, it's recommended
to upgrade to new XZ code from 7-Zip 9.38 beta. That new code fixes
some bugs." and we do use the XZ code.
The code is identical to the stock LZMA SDK with the following changes:
deleted bin/
added C/Util/Lzma/Android.mk
added MODULE_LICENSE_PUBLIC_DOMAIN
added NOTICE
added xz-embedded/
Change-Id: Ibc5d353748420f7b3ae2877d625d7ddb788bdc6e
Diffstat (limited to 'CPP/Common/StringConvert.h')
| -rw-r--r--[-rwxr-xr-x] | CPP/Common/StringConvert.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/CPP/Common/StringConvert.h b/CPP/Common/StringConvert.h index 1c7a951..d5518eb 100755..100644 --- a/CPP/Common/StringConvert.h +++ b/CPP/Common/StringConvert.h @@ -3,15 +3,19 @@ #ifndef __COMMON_STRING_CONVERT_H
#define __COMMON_STRING_CONVERT_H
-#include "MyWindows.h"
#include "MyString.h"
-#include "Types.h"
+#include "MyWindows.h"
UString MultiByteToUnicodeString(const AString &srcString, UINT codePage = CP_ACP);
+
+// optimized versions that work faster for ASCII strings
+void MultiByteToUnicodeString2(UString &dest, const AString &srcString, UINT codePage = CP_ACP);
+void UnicodeStringToMultiByte2(AString &dest, const UString &s, UINT codePage, char defaultChar, bool &defaultCharWasUsed);
+void UnicodeStringToMultiByte2(AString &dest, const UString &srcString, UINT codePage);
+
AString UnicodeStringToMultiByte(const UString &srcString, UINT codePage, char defaultChar, bool &defaultCharWasUsed);
AString UnicodeStringToMultiByte(const UString &srcString, UINT codePage = CP_ACP);
-
inline const wchar_t* GetUnicodeString(const wchar_t* unicodeString)
{ return unicodeString; }
inline const UString& GetUnicodeString(const UString &unicodeString)
|