fixes after merge

This commit is contained in:
Dane Springmeyer 2014-02-27 11:17:50 -08:00
parent 277ae93d2c
commit fead2e2584

View file

@ -241,7 +241,7 @@ void agg_renderer<T>::start_style_processing(feature_type_style const& st)
{ {
int radius = 0; int radius = 0;
mapnik::filter::filter_radius_visitor visitor(radius); mapnik::filter::filter_radius_visitor visitor(radius);
BOOST_FOREACH(mapnik::filter::filter_type const& filter_tag, st.image_filters()) for(mapnik::filter::filter_type const& filter_tag : st.image_filters())
{ {
boost::apply_visitor(visitor, filter_tag); boost::apply_visitor(visitor, filter_tag);
} }
@ -259,7 +259,7 @@ void agg_renderer<T>::start_style_processing(feature_type_style const& st)
(internal_buffer_->width() < target_width || (internal_buffer_->width() < target_width ||
internal_buffer_->height() < target_height)) internal_buffer_->height() < target_height))
{ {
internal_buffer_ = boost::make_shared<buffer_type>(target_width,target_height); internal_buffer_ = std::make_shared<buffer_type>(target_width,target_height);
} }
else else
{ {
@ -270,7 +270,7 @@ void agg_renderer<T>::start_style_processing(feature_type_style const& st)
{ {
if (!internal_buffer_) if (!internal_buffer_)
{ {
internal_buffer_ = boost::make_shared<buffer_type>(width_,height_); internal_buffer_ = std::make_shared<buffer_type>(width_,height_);
} }
else else
{ {