Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for decoding of utf-16 surrogates. Also remove #include that's not needed

Browse Source 
after all.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-03-30 22:00:19 +00:00
parent 934b2e18c5
commit cdb14ecbe7
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/strconv.cpp
View File

@@ -55,9 +55,6 @@
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
#endif
#if defined(__WIN32__) && !defined(__WXMICROWIN__) #if defined(__WIN32__) && !defined(__WXMICROWIN__)
#define wxHAVE_WIN32_MB2WC #define wxHAVE_WIN32_MB2WC
@@ -155,7 +152,7 @@ static size_t decode_utf16(const wxUint16* input, wxUint32& output)
output = *input; output = *input;
return 1; return 1;
} }
else if ((input[1]<0xdc00) || (input[1]>=0xdfff)) else if ((input[1]<0xdc00) || (input[1]>0xdfff))
{ {
output = *input; output = *input;
return (size_t)-1; return (size_t)-1;