diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2017-06-15 10:11:08 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2017-06-15 10:11:08 +1000 |
| commit | 129b15637d0b011c8a78af42269b4de93c3fe69e (patch) | |
| tree | 2ced65b19f570a046c6d6ea1aa7244d83f39b385 | |
| parent | b3744f2f5f939d11e67f3558f644c4acf8935b54 (diff) | |
| download | scintilla-mirror-129b15637d0b011c8a78af42269b4de93c3fe69e.tar.gz | |
Apply change set 6308 to LongTerm3 branch.
Fix bug where retrieving encoded bytes failed.
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 64dffbd4f..2b20c38a4 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1778,7 +1778,7 @@ int ScintillaCocoa::EncodedFromUTF8(char *utf8, char *encoded) const const CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(), vs.styles[STYLE_DEFAULT].characterSet); - CFStringRef cfsVal = CFStringFromString(utf8, inputLength, encoding); + CFStringRef cfsVal = CFStringFromString(utf8, inputLength, kCFStringEncodingUTF8); const std::string sEncoded = EncodedBytesString(cfsVal, encoding); if (encoded) memcpy(encoded, sEncoded.c_str(), sEncoded.length()); |