diff --git a/bindings/python/mapnik_text_placement.cpp b/bindings/python/mapnik_text_placement.cpp index 7abf019d9..2e598747a 100644 --- a/bindings/python/mapnik_text_placement.cpp +++ b/bindings/python/mapnik_text_placement.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include "mapnik_enumeration.hpp" diff --git a/include/mapnik/text/placement_finder.hpp b/include/mapnik/text/placement_finder.hpp index 3a307040f..e79642183 100644 --- a/include/mapnik/text/placement_finder.hpp +++ b/include/mapnik/text/placement_finder.hpp @@ -25,7 +25,7 @@ //mapnik #include #include -#include +#include #include #include #include diff --git a/include/mapnik/text/layout.hpp b/include/mapnik/text/text_layout.hpp similarity index 100% rename from include/mapnik/text/layout.hpp rename to include/mapnik/text/text_layout.hpp diff --git a/src/build.py b/src/build.py index 12889f56e..eb45bd0aa 100644 --- a/src/build.py +++ b/src/build.py @@ -203,7 +203,7 @@ source = Split( warp.cpp css_color_grammar.cpp text/vertex_cache.cpp - text/layout.cpp + text/text_layout.cpp text/text_line.cpp text/itemizer.cpp text/scrptrun.cpp diff --git a/src/text/formatting/layout.cpp b/src/text/formatting/layout.cpp index 01044dba3..c3ecb07c3 100644 --- a/src/text/formatting/layout.cpp +++ b/src/text/formatting/layout.cpp @@ -22,7 +22,7 @@ // mapnik #include -#include +#include #include #include #include diff --git a/src/text/formatting/text.cpp b/src/text/formatting/text.cpp index 568434c0e..024ed7176 100644 --- a/src/text/formatting/text.cpp +++ b/src/text/formatting/text.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include // boost #include diff --git a/src/text/placement_finder.cpp b/src/text/placement_finder.cpp index cb3fe460f..0519efdd8 100644 --- a/src/text/placement_finder.cpp +++ b/src/text/placement_finder.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -57,9 +57,7 @@ placement_finder::placement_finder(feature_impl const& feature, placements_(), has_marker_(false), marker_(), - marker_box_() -{ -} + marker_box_() {} bool placement_finder::next_position() { diff --git a/src/text/symbolizer_helpers.cpp b/src/text/symbolizer_helpers.cpp index 184b962b8..ccf3cfa81 100644 --- a/src/text/symbolizer_helpers.cpp +++ b/src/text/symbolizer_helpers.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/text/layout.cpp b/src/text/text_layout.cpp similarity index 99% rename from src/text/layout.cpp rename to src/text/text_layout.cpp index 65f8cb447..1692f7743 100644 --- a/src/text/layout.cpp +++ b/src/text/text_layout.cpp @@ -20,7 +20,7 @@ * *****************************************************************************/ -#include +#include #include #include #include diff --git a/src/text/text_properties.cpp b/src/text/text_properties.cpp index 8751f8622..a982bad73 100644 --- a/src/text/text_properties.cpp +++ b/src/text/text_properties.cpp @@ -21,7 +21,7 @@ *****************************************************************************/ // mapnik #include -#include +#include #include #include #include