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

Qualify ICU types explicitly

Browse source 
ICU 61 has dropped the global `using namespace icu;`
http://site.icu-project.org/download/61#TOC-Migration-Issues
This commit is contained in:
Raul Marin 2018-04-03 13:18:03 +02:00
parent f7098a8a7e
commit 1ddfe6c315
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/text/scrptrun.hpp
View file

@ -37,7 +37,7 @@ struct ParenStackEntry
UScriptCode scriptCode = USCRIPT_INVALID_CODE; UScriptCode scriptCode = USCRIPT_INVALID_CODE;
}; };
class ScriptRun : public UObject { class ScriptRun : public icu::UObject {
public: public:
ScriptRun(); ScriptRun();

4
src/text/text_layout.cpp
View file

@ -207,6 +207,7 @@ void text_layout::layout()
// At the end everything that is left over is added as the final line. // At the end everything that is left over is added as the final line.
void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits) void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits)
{ {
using BreakIterator = icu::BreakIterator;
text_line line(line_limits.first, line_limits.second); text_line line(line_limits.first, line_limits.second);
shape_text(line); shape_text(line);
@ -228,7 +229,7 @@ void text_layout::break_line_icu(std::pair<unsigned, unsigned> && line_limits)
} }
mapnik::value_unicode_string const& text = itemizer_.text(); mapnik::value_unicode_string const& text = itemizer_.text();
Locale locale; // TODO: Is the default constructor correct? icu::Locale locale; // TODO: Is the default constructor correct?
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status)); std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status));
@ -336,6 +337,7 @@ inline int adjust_last_break_position (int pos, bool repeat_wrap_char)
void text_layout::break_line(std::pair<unsigned, unsigned> && line_limits) void text_layout::break_line(std::pair<unsigned, unsigned> && line_limits)
{ {
using BreakIterator = icu::BreakIterator;
text_line line(line_limits.first, line_limits.second); text_line line(line_limits.first, line_limits.second);
shape_text(line); shape_text(line);
double scaled_wrap_width = wrap_width_ * scale_factor_; double scaled_wrap_width = wrap_width_ * scale_factor_;