From 129b15637d0b011c8a78af42269b4de93c3fe69e Mon Sep 17 00:00:00 2001 From: Neil Hodgson Date: Thu, 15 Jun 2017 10:11:08 +1000 Subject: Apply change set 6308 to LongTerm3 branch. Fix bug where retrieving encoded bytes failed. --- cocoa/ScintillaCocoa.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); -- cgit v1.2.3