Compare commits
2 commits
master
...
prepare_gl
Author | SHA1 | Date | |
---|---|---|---|
|
eadd8b0297 | ||
|
3dbe3644d8 |
3 changed files with 3 additions and 3 deletions
|
@ -28,7 +28,7 @@
|
|||
namespace mapnik { namespace detail {
|
||||
struct evaluated_format_properties;
|
||||
}
|
||||
using evaluated_format_properties_ptr = std::unique_ptr<detail::evaluated_format_properties>;
|
||||
using evaluated_format_properties_ptr = std::shared_ptr<detail::evaluated_format_properties>;
|
||||
}
|
||||
|
||||
#endif // EVALUATED_FORMAT_PROPERTIES_PTR_HPP
|
||||
|
|
|
@ -54,7 +54,7 @@ struct glyph_info : util::noncopyable
|
|||
glyph_info(glyph_info && rhs)
|
||||
: glyph_index(std::move(rhs.glyph_index)),
|
||||
char_index(std::move(rhs.char_index)),
|
||||
format(rhs.format), // take ref
|
||||
format(std::move(rhs.format)), //shared_ptr
|
||||
face(std::move(rhs.face)), // shared_ptr move just ref counts, right?
|
||||
unscaled_ymin(std::move(rhs.unscaled_ymin)),
|
||||
unscaled_ymax(std::move(rhs.unscaled_ymax)),
|
||||
|
|
|
@ -169,7 +169,7 @@ void text_layout::add_child(text_layout_ptr const& child_layout)
|
|||
|
||||
evaluated_format_properties_ptr & text_layout::new_child_format_ptr(evaluated_format_properties_ptr const& p)
|
||||
{
|
||||
format_ptrs_.emplace_back(std::make_unique<detail::evaluated_format_properties>(*p));
|
||||
format_ptrs_.emplace_back(std::make_shared<detail::evaluated_format_properties>(*p));
|
||||
return format_ptrs_.back();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue