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

temp fix: copy rather than move image_data inside marker to avoid mutating marker

Browse source
This commit is contained in:
Dane Springmeyer 2015-01-20 20:38:22 -08:00
parent 4856886284
commit df9613369e
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/agg/process_line_pattern_symbolizer.cpp
View file

@ -78,10 +78,16 @@ void agg_renderer<T0,T1>::process(line_pattern_symbolizer const& sym,
value_double opacity = get<value_double, keys::opacity>(sym, feature, common_.vars_);
if ((*marker_ptr)->is_bitmap())
{
pat = boost::optional<std::shared_ptr<buffer_type>>(
std::make_shared<buffer_type>(
std::move(util::get<buffer_type>(**(*marker_ptr)->get_bitmap_data())
)));
// FIXME: copy is necessary atm to transform a
// shared_ptr<image_data_any> into shared_ptr<image_data_rgba8>
boost::optional<image_ptr> bitmap = (*marker_ptr)->get_bitmap_data();
if (bitmap) {
mapnik::image_data_any const& im = *(bitmap)->get();
if (im.is<buffer_type>()) {
// invoke copy ctor of image_data_rgba8
pat = std::make_shared<buffer_type>(util::get<buffer_type>(im));
}
}
}
else
{

15
src/agg/process_polygon_pattern_symbolizer.cpp
View file

@ -68,11 +68,16 @@ void agg_renderer<T0,T1>::process(polygon_pattern_symbolizer const& sym,
if ((*marker_ptr)->is_bitmap())
{
pat = boost::optional<std::shared_ptr<buffer_type>>(
std::make_shared<buffer_type>(
std::move(util::get<buffer_type>(**(*marker_ptr)->get_bitmap_data())
)));
//pat = (*marker_ptr)->get_bitmap_data();
// FIXME: copy is necessary atm to transform a
// shared_ptr<image_data_any> into shared_ptr<image_data_rgba8>
boost::optional<image_ptr> bitmap = (*marker_ptr)->get_bitmap_data();
if (bitmap) {
mapnik::image_data_any const& im = *(bitmap)->get();
if (im.is<buffer_type>()) {
// invoke copy ctor of image_data_rgba8
pat = std::make_shared<buffer_type>(util::get<buffer_type>(im));
}
}
}
else
{