Permalink
Browse files

fix compile after geometry util namespacing

  • Loading branch information...
1 parent fd209b2 commit a968150f6b34d6a25e30d22461b66b6d9da930fb @springmeyer springmeyer committed Jul 20, 2012
View
2 include/mapnik/hit_test_filter.hpp
@@ -42,7 +42,7 @@ class hit_test_filter
{
BOOST_FOREACH(geometry_type & geom, feature.paths())
{
- if (hit_test(geom, x_,y_,tol_))
+ if (label::hit_test(geom, x_,y_,tol_))
return true;
}
return false;
View
2 src/agg/process_markers_symbolizer.cpp
@@ -94,7 +94,7 @@ struct markers_rasterizer_dispatch
double x,y;
path.rewind(0);
- label_interior_position(path, x, y);
+ label::interior_position(path, x, y);
agg::trans_affine matrix = marker_trans_;
matrix.translate(x,y);
box2d<double> transformed_bbox = bbox_ * matrix;
View
2 src/agg/process_point_symbolizer.cpp
@@ -84,7 +84,7 @@ void agg_renderer<T>::process(point_symbolizer const& sym,
if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT)
label::centroid(geom, x, y);
else
- label_interior_position(geom ,x, y);
+ label::interior_position(geom ,x, y);
prj_trans.backward(x,y,z);
t_.forward(&x,&y);
View
4 src/cairo_renderer.cpp
@@ -1160,7 +1160,7 @@ void cairo_renderer_base::process(point_symbolizer const& sym,
if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT)
label::centroid(geom, x, y);
else
- label_interior_position(geom, x, y);
+ label::interior_position(geom, x, y);
prj_trans.backward(x, y, z);
t_.forward(&x, &y);
@@ -1438,7 +1438,7 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
double x;
double y;
double z=0;
- label_interior_position(geom, x, y);
+ label::interior_position(geom, x, y);
prj_trans.backward(x,y,z);
t_.forward(&x,&y);
extent.re_center(x,y);
View
2 src/grid/process_markers_symbolizer.cpp
@@ -128,7 +128,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
double x;
double y;
double z=0;
- label_interior_position(geom, x, y);
+ label::interior_position(geom, x, y);
prj_trans.backward(x,y,z);
t_.forward(&x,&y);
geom_tr.transform(&x,&y);
View
2 src/grid/process_point_symbolizer.cpp
@@ -76,7 +76,7 @@ void grid_renderer<T>::process(point_symbolizer const& sym,
if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT)
label::centroid(geom, x, y);
else
- label_interior_position(geom, x, y);
+ label::interior_position(geom, x, y);
prj_trans.backward(x,y,z);
t_.forward(&x,&y);

0 comments on commit a968150

Please sign in to comment.