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

parse_svg_value - add DPI template parameter (default 90) (#3233)

Browse source
This commit is contained in:
artemp 2016-01-15 09:38:46 +00:00
parent c615708a2a
commit 1bfabec6be
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/svg/svg_parser.cpp
View file

@ -134,7 +134,7 @@ double parse_double(T & error_messages, const char* str)
}
// https://www.w3.org/TR/SVG/coords.html#Units
template <typename T>
template <typename T, int DPI = 90>
double parse_svg_value(T & error_messages, const char* str, bool & percent)
{
using namespace boost::spirit::qi;
@ -146,12 +146,11 @@ double parse_svg_value(T & error_messages, const char* str, bool & percent)
double val = 0.0;
symbols<char, double> units;
units.add
("px", 1.0)
("pt", 1.25)
("pc", 15.0)
("mm", 3.543307)
("cm", 35.43307)
("in", 90.0)
("pt", DPI/72.0)
("pc", DPI/6.0)
("mm", DPI/25.4)
("cm", DPI/2.54)
("in", (double)DPI)
;
if (!phrase_parse(str, str + std::strlen(str),
double_[ref(val) = _1, ref(percent) = false]