use icu shaper to avoid needing to build harfbuzz right now - refs #2396
This commit is contained in:
parent
5789777199
commit
ee1c2aec47
1 changed files with 2 additions and 2 deletions
|
@ -24,7 +24,7 @@
|
||||||
#include <mapnik/text/text_properties.hpp>
|
#include <mapnik/text/text_properties.hpp>
|
||||||
#include <mapnik/expression_evaluator.hpp>
|
#include <mapnik/expression_evaluator.hpp>
|
||||||
#include <mapnik/debug.hpp>
|
#include <mapnik/debug.hpp>
|
||||||
#include <mapnik/text/harfbuzz_shaper.hpp>
|
#include <mapnik/text/icu_shaper.hpp>
|
||||||
|
|
||||||
// ICU
|
// ICU
|
||||||
#include <unicode/brkiter.h>
|
#include <unicode/brkiter.h>
|
||||||
|
@ -229,7 +229,7 @@ void text_layout::clear()
|
||||||
|
|
||||||
void text_layout::shape_text(text_line & line)
|
void text_layout::shape_text(text_line & line)
|
||||||
{
|
{
|
||||||
harfbuzz_shaper::shape_text(line, itemizer_, width_map_, font_manager_, scale_factor_);
|
icu_shaper::shape_text(line, itemizer_, width_map_, font_manager_, scale_factor_);
|
||||||
}
|
}
|
||||||
|
|
||||||
void text_layout::evaluate_properties(feature_impl const& feature, attributes const& attrs)
|
void text_layout::evaluate_properties(feature_impl const& feature, attributes const& attrs)
|
||||||
|
|
Loading…
Reference in a new issue