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

fix compile after geometry util namespacing

Browse source
This commit is contained in:
Dane Springmeyer 2012-07-20 11:18:33 -07:00
parent fd209b2958
commit a968150f6b
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/hit_test_filter.hpp
View file

@ -42,7 +42,7 @@ public:
{ {
BOOST_FOREACH(geometry_type & geom, feature.paths()) 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 true;
} }
return false; return false;

2
src/agg/process_markers_symbolizer.cpp
View file

@ -94,7 +94,7 @@ struct markers_rasterizer_dispatch
double x,y; double x,y;
path.rewind(0); path.rewind(0);
label_interior_position(path, x, y); label::interior_position(path, x, y);
agg::trans_affine matrix = marker_trans_; agg::trans_affine matrix = marker_trans_;
matrix.translate(x,y); matrix.translate(x,y);
box2d<double> transformed_bbox = bbox_ * matrix; box2d<double> transformed_bbox = bbox_ * matrix;

2
src/agg/process_point_symbolizer.cpp
View file

@ -84,7 +84,7 @@ void agg_renderer<T>::process(point_symbolizer const& sym,
if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT) if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT)
label::centroid(geom, x, y); label::centroid(geom, x, y);
else else
label_interior_position(geom ,x, y); label::interior_position(geom ,x, y);
prj_trans.backward(x,y,z); prj_trans.backward(x,y,z);
t_.forward(&x,&y); t_.forward(&x,&y);

4
src/cairo_renderer.cpp
View file

@ -1160,7 +1160,7 @@ void cairo_renderer_base::process(point_symbolizer const& sym,
if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT) if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT)
label::centroid(geom, x, y); label::centroid(geom, x, y);
else else
label_interior_position(geom, x, y); label::interior_position(geom, x, y);
prj_trans.backward(x, y, z); prj_trans.backward(x, y, z);
t_.forward(&x, &y); t_.forward(&x, &y);
@ -1438,7 +1438,7 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
double x; double x;
double y; double y;
double z=0; double z=0;
label_interior_position(geom, x, y); label::interior_position(geom, x, y);
prj_trans.backward(x,y,z); prj_trans.backward(x,y,z);
t_.forward(&x,&y); t_.forward(&x,&y);
extent.re_center(x,y); extent.re_center(x,y);

2
src/grid/process_markers_symbolizer.cpp
View file

@ -128,7 +128,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
double x; double x;
double y; double y;
double z=0; double z=0;
label_interior_position(geom, x, y); label::interior_position(geom, x, y);
prj_trans.backward(x,y,z); prj_trans.backward(x,y,z);
t_.forward(&x,&y); t_.forward(&x,&y);
geom_tr.transform(&x,&y); geom_tr.transform(&x,&y);

2
src/grid/process_point_symbolizer.cpp
View file

@ -76,7 +76,7 @@ void grid_renderer<T>::process(point_symbolizer const& sym,
if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT) if (sym.get_point_placement() == CENTROID_POINT_PLACEMENT)
label::centroid(geom, x, y); label::centroid(geom, x, y);
else else
label_interior_position(geom, x, y); label::interior_position(geom, x, y);
prj_trans.backward(x,y,z); prj_trans.backward(x,y,z);
t_.forward(&x,&y); t_.forward(&x,&y);