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

pre-commit run --all-files

Browse source
This commit is contained in:
Artem Pavlenko 2022-12-12 10:46:41 +00:00
parent d29aeb2ddb
commit f4eec2e24f
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/unit/svg/svg_parser_test.cpp
View file

@ -55,11 +55,11 @@ std::ostream& operator<<(std::ostream& os, mapnik::gradient const& gr)
double cx, cy, fx, fy, r; double cx, cy, fx, fy, r;
gr.get_control_points(fx, fy, cx, cy, r); gr.get_control_points(fx, fy, cx, cy, r);
os << "<gradient cx=\"" << cx << "\" cy=\"" << cy << "\"" os << "<gradient cx=\"" << cx << "\" cy=\"" << cy << "\""
<< " fx=\"" << fx << "\" fy=\"" << fy << "\" r=\"" << r << "\">\n"; << " fx=\"" << fx << "\" fy=\"" << fy << "\" r=\"" << r << "\">\n";
for (auto const& stop : gr.get_stop_array()) for (auto const& stop : gr.get_stop_array())
{ {
os << " <stop offset=\"" << std::get<0>(stop) << "\" color=\"" << std::get<1>(stop) << "\"/>\n"; os << " <stop offset=\"" << std::get<0>(stop) << "\" color=\"" << std::get<1>(stop) << "\"/>\n";
} }
os << "</gradient>\n"; os << "</gradient>\n";
@ -69,8 +69,7 @@ std::ostream& operator<<(std::ostream& os, mapnik::gradient const& gr)
std::ostream& operator<<(std::ostream& os, agg::trans_affine const& tr) std::ostream& operator<<(std::ostream& os, agg::trans_affine const& tr)
{ {
os << "<transform>matrix(" << tr.sx << "," << tr.shy << "," os << "<transform>matrix(" << tr.sx << "," << tr.shy << "," << tr.shx << "," << tr.sy << "," << tr.tx << ","
<< tr.shx << "," << tr.sy << "," << tr.tx << ","
<< tr.ty << ")</transform>"; << tr.ty << ")</transform>";
return os; return os;
} }
@ -78,13 +77,14 @@ std::ostream& operator<<(std::ostream& os, agg::trans_affine const& tr)
struct group_attribute_visitor struct group_attribute_visitor
{ {
group_attribute_visitor(std::stringstream& ss, unsigned padding) group_attribute_visitor(std::stringstream& ss, unsigned padding)
: ss_(ss), padding_(padding) : ss_(ss)
, padding_(padding)
{} {}
void operator()(mapnik::svg::group const& g) const void operator()(mapnik::svg::group const& g) const
{ {
padding_ += 2; padding_ += 2;
//ss_ << "padding=>" << padding_ << std::endl; // ss_ << "padding=>" << padding_ << std::endl;
std::string pad(padding_, ' '); std::string pad(padding_, ' ');
ss_ << pad << "<g opacity=\"" << g.opacity << "\">" << std::endl; ss_ << pad << "<g opacity=\"" << g.opacity << "\">" << std::endl;
for (auto const& elem : g.elements) for (auto const& elem : g.elements)
@ -112,7 +112,7 @@ struct group_attribute_visitor
ss_ << pad << " <stroke-width>" << attr.stroke_width << "</stroke-width>" << std::endl; ss_ << pad << " <stroke-width>" << attr.stroke_width << "</stroke-width>" << std::endl;
ss_ << pad << " <stroke-opacity>" << attr.stroke_opacity << "</stroke-opacity>" << std::endl; ss_ << pad << " <stroke-opacity>" << attr.stroke_opacity << "</stroke-opacity>" << std::endl;
ss_ << pad << "</attribute>" << std::endl; ss_ << pad << "</attribute>" << std::endl;
padding_ -=2; padding_ -= 2;
} }
std::stringstream& ss_; std::stringstream& ss_;
mutable unsigned padding_; mutable unsigned padding_;