Skip to content

Commit de96f91

Browse files
authored
Use utf8cpp conversion (#376)
1 parent 58ef925 commit de96f91

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

scripts/conan

100644100755
File mode changed.

src/odr/internal/pdf/pdf_cmap.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#include <odr/internal/pdf/pdf_cmap.hpp>
22

33
#include <odr/internal/util/map_util.hpp>
4-
5-
#include <utf8cpp/utf8/cpp17.h>
4+
#include <odr/internal/util/string_util.hpp>
65

76
namespace odr::internal::pdf {
87

@@ -23,7 +22,7 @@ std::string CMap::translate_string(const std::string &glyphs) const {
2322
result += translate_glyph(glyph);
2423
}
2524

26-
return utf8::utf16to8(result);
25+
return util::string::u16string_to_string(result);
2726
}
2827

2928
} // namespace odr::internal::pdf

src/odr/internal/util/string_util.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
#include <algorithm>
44
#include <cctype>
5-
#include <codecvt>
65
#include <iomanip>
76
#include <locale>
87
#include <sstream>
98

9+
#include <utf8cpp/utf8/cpp17.h>
10+
1011
namespace odr::internal::util {
1112

1213
bool string::starts_with(const std::string &string, const std::string &with) {
@@ -72,15 +73,11 @@ std::string string::to_string(const double d, const int precision) {
7273
}
7374

7475
std::string string::u16string_to_string(const std::u16string &string) {
75-
static std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>
76-
convert;
77-
return convert.to_bytes(string);
76+
return utf8::utf16to8(string);
7877
}
7978

8079
std::u16string string::string_to_u16string(const std::string &string) {
81-
static std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>
82-
convert;
83-
return convert.from_bytes(string);
80+
return utf8::utf8to16(string);
8481
}
8582

8683
std::string string::c16str_to_string(const char16_t *c16str,

0 commit comments

Comments
 (0)