sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for U_ICU_VERSION_MAJOR_NUM >= 59 (#3729)

Browse source
This commit is contained in:
artemp 2017-07-19 16:07:39 +02:00
parent 24d07e7792
commit 9e58c89043
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/text/harfbuzz_shaper.hpp
View file

@ -40,6 +40,7 @@
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>
#include <harfbuzz/hb.h> #include <harfbuzz/hb.h>
#include <harfbuzz/hb-ft.h> #include <harfbuzz/hb-ft.h>
#include <unicode/uvernum.h>
#include <unicode/uscript.h> #include <unicode/uscript.h>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
@ -54,7 +55,8 @@ static inline hb_script_t _icu_script_to_script(UScriptCode script)
static inline const uint16_t * uchar_to_utf16(const UChar* src) static inline const uint16_t * uchar_to_utf16(const UChar* src)
{ {
static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t"); static_assert(sizeof(UChar) == sizeof(uint16_t),"UChar is eq size to uint16_t");
#if defined(_MSC_VER) #if defined(_MSC_VER) || (U_ICU_VERSION_MAJOR_NUM >= 59)
// ^^ http://site.icu-project.org/download/59#TOC-ICU4C-char16_t1
return reinterpret_cast<const uint16_t *>(src); return reinterpret_cast<const uint16_t *>(src);
#else #else
return src; return src;

2
include/mapnik/unicode.hpp
View file

@ -31,6 +31,8 @@
// std // std
#include <cstdint> #include <cstdint>
#include <string> #include <string>
// icu
#include <unicode/unistr.h>
struct UConverter; struct UConverter;