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

use numeric parser for arc flags

Browse source
This commit is contained in:
Artem Pavlenko 2020-01-16 10:38:10 +00:00
parent 44982cddc5
commit 60a33a9b8f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/svg/svg_path_grammar_x3_def.hpp
View file

@ -121,8 +121,8 @@ auto const arc_to = [] (auto & ctx)
auto const& attr = _attr(ctx); auto const& attr = _attr(ctx);
auto const& p = boost::fusion::at_c<0>(attr); auto const& p = boost::fusion::at_c<0>(attr);
double angle = boost::fusion::at_c<1>(attr); double angle = boost::fusion::at_c<1>(attr);
int large_arc_flag = (boost::fusion::at_c<2>(attr) == '1')? 1 : 0; bool large_arc_flag = boost::fusion::at_c<2>(attr);
int sweep_flag = (boost::fusion::at_c<3>(attr) == '1')? 1 : 0; bool sweep_flag = boost::fusion::at_c<3>(attr);
auto const& v = boost::fusion::at_c<4>(attr); auto const& v = boost::fusion::at_c<4>(attr);
extract_path(ctx).arc_to(std::get<0>(p), std::get<1>(p), extract_path(ctx).arc_to(std::get<0>(p), std::get<1>(p),
util::radians(angle), util::radians(angle),
@ -146,6 +146,8 @@ auto const absolute = [] (auto const& ctx)
extract_relative(ctx) = false; extract_relative(ctx) = false;
}; };
// arc flags parser 0/1
x3::uint_parser<std::uint8_t, 10, 1, 1> flag;
// rules // rules
auto const coord = x3::rule<class coord_tag, coord_type>{} = double_ > -lit(',') > double_; auto const coord = x3::rule<class coord_tag, coord_type>{} = double_ > -lit(',') > double_;
@ -176,8 +178,6 @@ auto const Q = x3::rule<class Q_tag> {} = (lit('Q')[absolute] | lit('q')[relativ
auto const T = x3::rule<class T_tag> {} = (lit('T')[absolute] | lit('t')[relative]) auto const T = x3::rule<class T_tag> {} = (lit('T')[absolute] | lit('t')[relative])
> ((coord ) [curve3_smooth] % -lit(',')); // +curve3_smooth (smooth-quadratic-bezier-curveto) > ((coord ) [curve3_smooth] % -lit(',')); // +curve3_smooth (smooth-quadratic-bezier-curveto)
auto const flag = x3::rule<class Flag_tag, int> {} = char_('0') | char_('1'); // arc-flag/sweep-flag
auto const A = x3::rule<class A_tag> {} = (lit('A')[absolute] | lit('a')[relative]) auto const A = x3::rule<class A_tag> {} = (lit('A')[absolute] | lit('a')[relative])
> ((coord > -lit(',') > double_ > -lit(',') > flag > -lit(',') > flag > -lit(',') > coord) > ((coord > -lit(',') > double_ > -lit(',') > flag > -lit(',') > flag > -lit(',') > coord)
[arc_to] % -lit(',')); // +arc_to; [arc_to] % -lit(',')); // +arc_to;