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

CSS parser - use appropriate storage type for hue value (0..320) (#4020)

Browse source
This commit is contained in:
Artem Pavlenko 2019-01-14 16:19:55 +00:00
parent 19a979955e
commit 16ae1c0472
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/css_color_grammar_x3_def.hpp
View file

@ -218,7 +218,7 @@ struct named_colors_ : x3::symbols<color>
x3::uint_parser<std::uint8_t, 16, 2, 2> hex2; x3::uint_parser<std::uint8_t, 16, 2, 2> hex2;
x3::uint_parser<std::uint8_t, 16, 1, 1> hex1; x3::uint_parser<std::uint8_t, 16, 1, 1> hex1;
x3::uint_parser<std::uint8_t, 10, 1, 3> dec3; x3::uint_parser<std::uint16_t, 10, 1, 3> dec3;
// starting rule // starting rule
css_color_grammar_type const css_color("css_color"); css_color_grammar_type const css_color("css_color");
@ -390,7 +390,7 @@ auto const rgba_color_percent_def = lit("rgba")
>> lit(',') >> dec3[percent_blue] >> lit('%') >> lit(',') >> dec3[percent_blue] >> lit('%')
>> lit(',') >> double_[opacity] >> lit(')'); >> lit(',') >> double_[opacity] >> lit(')');
auto const hsl_values = x3::rule<class hsl_values, std::tuple<std::uint8_t,std::uint8_t,std::uint8_t, double >> {} = auto const hsl_values = x3::rule<class hsl_values, std::tuple<std::uint16_t,std::uint8_t,std::uint8_t, double >> {} =
lit("hsl") lit("hsl")
>> lit('(') >> dec3 >> lit('(') >> dec3
>> lit(',') >> dec3 >> lit('%') >> lit(',') >> dec3 >> lit('%')
@ -398,7 +398,7 @@ auto const hsl_values = x3::rule<class hsl_values, std::tuple<std::uint8_t,std::
>> attr(1.0) >> lit(')') >> attr(1.0) >> lit(')')
; ;
auto const hsla_values = x3::rule<class hsla_values, std::tuple<std::uint8_t,std::uint8_t,std::uint8_t, double >> {} = auto const hsla_values = x3::rule<class hsla_values, std::tuple<std::uint16_t,std::uint8_t,std::uint8_t, double >> {} =
lit("hsla") lit("hsla")
>> lit('(') >> dec3 >> lit('(') >> dec3
>> lit(',') >> dec3 >> lit('%') >> lit(',') >> dec3 >> lit('%')