v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Use C++17 compliant utf8 encoding.

pull/4986/head
Kim Kulling 2023-02-28 21:53:18 +01:00
parent 46ae8534f7
commit a1aace74e5
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/SharedCode/UTFConverter.cpp
View File

@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace AssimpSamples { namespace AssimpSamples {
namespace SharedCode { namespace SharedCode {
typename UTFConverter::UTFConverterImpl UTFConverter::impl_; //typename UTFConverter::UTFConverterImpl UTFConverter::impl_;
} }
} }

43
samples/SharedCode/UTFConverter.h
View File

@ -45,43 +45,54 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define ASSIMP_SAMPLES_SHARED_CODE_UTFCONVERTER_H #define ASSIMP_SAMPLES_SHARED_CODE_UTFCONVERTER_H
#include <string> #include <string>
#include <locale> #include <vector>
#include <codecvt>
#ifdef ASSIMP_USE_HUNTER
#include <utf8.h>
#else
#include "../contrib/utf8cpp/source/utf8.h"
#endif
namespace AssimpSamples { namespace AssimpSamples {
namespace SharedCode { namespace SharedCode {
// Used to convert between multibyte and unicode strings. // Used to convert between multibyte and unicode strings.
class UTFConverter { class UTFConverter {
using UTFConverterImpl = std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t>;
public: public:
UTFConverter(const char* s) : //utf8::utf16to8(start, end, back_inserter(str));
s_(s),
ws_(impl_.from_bytes(s)) { UTFConverter(const char* s) : s_(s), ws_() {
std::vector<unsigned char> str;
utf8::utf8to16(s, s + std::strlen(s) + 1, back_inserter(str));
} }
UTFConverter(const wchar_t* s) :
s_(impl_.to_bytes(s)), UTFConverter(const wchar_t* s) : s_(),ws_(s) {
ws_(s) { std::vector<wchar_t> str;
utf8::utf16to8(s, s + ws_.size() + 1, back_inserter(str));
} }
UTFConverter(const std::string& s) :
s_(s), UTFConverter(const std::string& s) : s_(s), ws_() {
ws_(impl_.from_bytes(s)) { std::vector<unsigned char> str;
utf8::utf8to16(s.c_str(), s.c_str() + s.size() + 1, back_inserter(str));
} }
UTFConverter(const std::wstring& s) :
s_(impl_.to_bytes(s)), UTFConverter(const std::wstring& s) : s_(), ws_(s) {
ws_(s) { std::vector<wchar_t> str;
utf8::utf16to8(s.c_str(), s.c_str() + ws_.size() + 1, back_inserter(str));
} }
inline const char* c_str() const { inline const char* c_str() const {
return s_.c_str(); return s_.c_str();
} }
inline const std::string& str() const { inline const std::string& str() const {
return s_; return s_;
} }
inline const wchar_t* c_wstr() const { inline const wchar_t* c_wstr() const {
return ws_.c_str(); return ws_.c_str();
} }
private: private:
static UTFConverterImpl impl_;
std::string s_; std::string s_;
std::wstring ws_; std::wstring ws_;
}; };