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

git-clang-format

Browse source
This commit is contained in:
Artem Pavlenko 2022-11-03 11:29:50 +00:00
parent b438edd8da
commit bd018ef5ab
3 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mapnik/simplify_converter.hpp
View file

@ -184,7 +184,8 @@ struct simplify_converter
unsigned output_vertex_distance(double* x, double* y) unsigned output_vertex_distance(double* x, double* y)
{ {
if (status_ == done) return SEG_END; if (status_ == done)
return SEG_END;
if (status_ == closing) if (status_ == closing)
{ {
*x = *y = 0.0; *x = *y = 0.0;

4
src/load_map.cpp
View file

@ -595,8 +595,8 @@ void map_parser::parse_fontset(Map& map, xml_node const& node)
else else
{ {
MAPNIK_LOG_WARN(fontset) MAPNIK_LOG_WARN(fontset)
<< "warning: unable to find face-name '" << n.get_attr<std::string>("face-name", "") << "warning: unable to find face-name '" << n.get_attr<std::string>("face-name", "")
<< "' in FontSet '" << fontset.get_name() << "'"; << "' in FontSet '" << fontset.get_name() << "'";
} }
} }
} }

55
test/unit/svg/svg_path_parser_test.cpp
View file

@ -97,7 +97,7 @@ TEST_CASE("SVG path parser")
std::make_tuple(450, 117.157, 4), std::make_tuple(450, 117.157, 4),
std::make_tuple(382.843, 50, 4), std::make_tuple(382.843, 50, 4),
std::make_tuple(300, 50, 4), std::make_tuple(300, 50, 4),
std::make_tuple(300, 50, 2), std::make_tuple(300, 50, 2),
std::make_tuple(300, 200, 79)}; std::make_tuple(300, 200, 79)};
test_path_parser(str, expected); test_path_parser(str, expected);
} }
@ -111,7 +111,7 @@ TEST_CASE("SVG path parser")
std::make_tuple(192.157, 25, 4), std::make_tuple(192.157, 25, 4),
std::make_tuple(125, 92.1573, 4), std::make_tuple(125, 92.1573, 4),
std::make_tuple(125, 175, 4), std::make_tuple(125, 175, 4),
std::make_tuple(125, 175, 2), std::make_tuple(125, 175, 2),
std::make_tuple(275, 175, 79)}; std::make_tuple(275, 175, 79)};
test_path_parser(str, expected); test_path_parser(str, expected);
} }
@ -125,40 +125,23 @@ TEST_CASE("SVG path parser")
"a25,100-30 0150-25l50-25"; "a25,100-30 0150-25l50-25";
std::vector<std::tuple<double, double, unsigned>> expected = { std::vector<std::tuple<double, double, unsigned>> expected = {
std::make_tuple(600, 350, 1), std::make_tuple(600, 350, 1), std::make_tuple(650, 325, 2),
std::make_tuple(650, 325, 2), std::make_tuple(643.096, 311.193, 4), std::make_tuple(648.693, 294.404, 4),
std::make_tuple(643.096, 311.193, 4), std::make_tuple(662.5, 287.5, 4), std::make_tuple(676.307, 280.596, 4),
std::make_tuple(648.693, 294.404, 4), std::make_tuple(693.096, 286.193, 4), std::make_tuple(700, 300, 4),
std::make_tuple(662.5, 287.5, 4), std::make_tuple(700, 300, 2), std::make_tuple(750, 275, 2),
std::make_tuple(676.307, 280.596, 4), std::make_tuple(734.991, 248.079, 4), std::make_tuple(734.017, 220.66, 4),
std::make_tuple(693.096, 286.193, 4), std::make_tuple(747.825, 213.756, 4), std::make_tuple(761.632, 206.852, 4),
std::make_tuple(700, 300, 4), std::make_tuple(784.991, 223.079, 4), std::make_tuple(800, 250, 4),
std::make_tuple(700, 300, 2), std::make_tuple(800, 250, 2), std::make_tuple(850, 225, 2),
std::make_tuple(750, 275, 2), std::make_tuple(827.153, 184.812, 4), std::make_tuple(819.825, 146.636, 4),
std::make_tuple(734.991, 248.079, 4), std::make_tuple(833.632, 139.733, 4), std::make_tuple(847.44, 132.829, 4),
std::make_tuple(734.017, 220.66, 4), std::make_tuple(877.153, 159.812, 4), std::make_tuple(900, 200, 4),
std::make_tuple(747.825, 213.756, 4), std::make_tuple(900, 200, 2), std::make_tuple(950, 175, 2),
std::make_tuple(761.632, 206.852, 4), std::make_tuple(919.382, 121.506, 4), std::make_tuple(905.754, 72.5436, 4),
std::make_tuple(784.991, 223.079, 4), std::make_tuple(919.561, 65.64, 4), std::make_tuple(933.368, 58.7365, 4),
std::make_tuple(800, 250, 4), std::make_tuple(969.382, 96.5057, 4), std::make_tuple(1000, 150, 4),
std::make_tuple(800, 250, 2), std::make_tuple(1000, 150, 2), std::make_tuple(1050, 125, 2)};
std::make_tuple(850, 225, 2),
std::make_tuple(827.153, 184.812, 4),
std::make_tuple(819.825, 146.636, 4),
std::make_tuple(833.632, 139.733, 4),
std::make_tuple(847.44, 132.829, 4),
std::make_tuple(877.153, 159.812, 4),
std::make_tuple(900, 200, 4),
std::make_tuple(900, 200, 2),
std::make_tuple(950, 175, 2),
std::make_tuple(919.382, 121.506, 4),
std::make_tuple(905.754, 72.5436, 4),
std::make_tuple(919.561, 65.64, 4),
std::make_tuple(933.368, 58.7365, 4),
std::make_tuple(969.382, 96.5057, 4),
std::make_tuple(1000, 150, 4),
std::make_tuple(1000, 150, 2),
std::make_tuple(1050, 125, 2)};
test_path_parser(str, expected); test_path_parser(str, expected);
} }