archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

don't pass expression_ptr as const

Browse Source
This commit is contained in:
Dane Springmeyer 2010-02-03 18:36:01 +00:00
parent 316a35d08d
commit c3ea59c3c8
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bindings/python/mapnik_text_symbolizer.cpp
View File

@ -252,8 +252,7 @@ class_<text_symbolizer>("TextSymbolizer",init<expression_ptr,std::string const&,
.add_property("minimum_distance",
&text_symbolizer::get_minimum_distance,
&text_symbolizer::set_minimum_distance)
.add_property("name",make_function
(&text_symbolizer::get_name,return_value_policy<copy_const_reference>()),
.add_property("name",&text_symbolizer::get_name,
&text_symbolizer::set_name)
.add_property("opacity",
&text_symbolizer::get_opacity,

8
include/mapnik/text_symbolizer.hpp
View File

@ -98,12 +98,8 @@ namespace mapnik
text_symbolizer(expression_ptr name, unsigned size, color const& fill);
text_symbolizer(text_symbolizer const& rhs);
text_symbolizer& operator=(text_symbolizer const& rhs);
//
expression_ptr const& get_name() const;
void set_name(const expression_ptr& expr);
//
expression_ptr get_name() const;
void set_name(expression_ptr expr);
unsigned get_text_ratio() const; // target ratio for text bounding box in pixels
void set_text_ratio(unsigned ratio);
unsigned get_wrap_width() const; // width to wrap text at, or trigger ratio

4
src/text_symbolizer.cpp
View File

@ -205,12 +205,12 @@ text_symbolizer& text_symbolizer::operator=(text_symbolizer const& other)
return *this;
}
expression_ptr const& text_symbolizer::get_name() const
expression_ptr text_symbolizer::get_name() const
{
return name_;
}
void text_symbolizer::set_name(const expression_ptr& name)
void text_symbolizer::set_name(expression_ptr name)
{
name_ = name;
}