Removed the Perl dependencies on Encode, Encode::Locale and Unicode::Normalize. Added dependency on boost::locale. Added encode_path, decode_path, normalize_utf8 functions to Slic3r.xs Slic3r.xs has been made mostly utf8 safe by using the boost::nowide library, thanks to @alexrj for the idea. Simplified the encode_path / decode_path stuff: wxWidgets are unicode already, so there is no need to decode_path() from it. Perl / win32 interfacing is non-unicode, so decode_path() is executed on ARGV just at the beginning of the perl scripts.
35 lines
826 B
C++
35 lines
826 B
C++
#ifndef slic3r_Utils_hpp_
|
|
#define slic3r_Utils_hpp_
|
|
|
|
namespace Slic3r {
|
|
|
|
extern void set_logging_level(unsigned int level);
|
|
extern void trace(unsigned int level, const char *message);
|
|
|
|
extern std::string encode_path(const char *src);
|
|
extern std::string decode_path(const char *src);
|
|
extern std::string normalize_utf8_nfc(const char *src);
|
|
|
|
// Compute the next highest power of 2 of 32-bit v
|
|
// http://graphics.stanford.edu/~seander/bithacks.html
|
|
template<typename T>
|
|
inline T next_highest_power_of_2(T v)
|
|
{
|
|
if (v != 0)
|
|
-- v;
|
|
v |= v >> 1;
|
|
v |= v >> 2;
|
|
v |= v >> 4;
|
|
if (sizeof(T) >= sizeof(uint16_t))
|
|
v |= v >> 8;
|
|
if (sizeof(T) >= sizeof(uint32_t))
|
|
v |= v >> 16;
|
|
if (sizeof(T) >= sizeof(uint64_t))
|
|
v |= v >> 32;
|
|
return ++ v;
|
|
}
|
|
|
|
} // namespace Slic3r
|
|
|
|
#endif // slic3r_Utils_hpp_
|