fix compile after merge with 2.3.x

This commit is contained in:
Dane Springmeyer 2013-10-02 19:37:07 -07:00
parent 9c8f7cc90d
commit 5b3e89df94

View file

@ -451,7 +451,7 @@ struct test11a
extent_.maxy()); extent_.maxy());
unsigned cmd; unsigned cmd;
double x,y; double x,y;
mapnik::geometry_type geom2(mapnik::Polygon); mapnik::geometry_type geom2(mapnik::geometry_type::types::Polygon);
while ((cmd = clipped.vertex(&x, &y)) != SEG_END) { while ((cmd = clipped.vertex(&x, &y)) != SEG_END) {
geom2.push_vertex(x,y,(mapnik::CommandType)cmd); geom2.push_vertex(x,y,(mapnik::CommandType)cmd);
} }
@ -533,7 +533,7 @@ struct test11
clipped.rewind(0); clipped.rewind(0);
unsigned cmd; unsigned cmd;
double x,y; double x,y;
mapnik::geometry_type geom2(mapnik::Polygon); mapnik::geometry_type geom2(mapnik::geometry_type::types::Polygon);
while ((cmd = clipped.vertex(&x, &y)) != SEG_END) { while ((cmd = clipped.vertex(&x, &y)) != SEG_END) {
geom2.push_vertex(x,y,(mapnik::CommandType)cmd); geom2.push_vertex(x,y,(mapnik::CommandType)cmd);
} }
@ -609,7 +609,7 @@ struct test12
poly_clipper clipped(extent_, geom); poly_clipper clipped(extent_, geom);
unsigned cmd; unsigned cmd;
double x,y; double x,y;
mapnik::geometry_type geom2(mapnik::Polygon); mapnik::geometry_type geom2(mapnik::geometry_type::types::Polygon);
while ((cmd = clipped.vertex(&x, &y)) != SEG_END) { while ((cmd = clipped.vertex(&x, &y)) != SEG_END) {
geom2.push_vertex(x,y,(mapnik::CommandType)cmd); geom2.push_vertex(x,y,(mapnik::CommandType)cmd);
} }