don't return reference to temporary, and intialize metawriter values
This commit is contained in:
parent
9cf0a8deca
commit
2fa027855a
2 changed files with 8 additions and 2 deletions
|
@ -39,6 +39,12 @@ class Map;
|
||||||
|
|
||||||
class MAPNIK_DECL symbolizer_base {
|
class MAPNIK_DECL symbolizer_base {
|
||||||
public:
|
public:
|
||||||
|
symbolizer_base():
|
||||||
|
properties_(),
|
||||||
|
properties_complete_(),
|
||||||
|
writer_name_(),
|
||||||
|
writer_ptr_() {}
|
||||||
|
|
||||||
/** Add a metawriter to this symbolizer.
|
/** Add a metawriter to this symbolizer.
|
||||||
*
|
*
|
||||||
* expression can be empty the default expression of
|
* expression can be empty the default expression of
|
||||||
|
@ -83,7 +89,7 @@ public:
|
||||||
void set_filename(path_expression_ptr filename);
|
void set_filename(path_expression_ptr filename);
|
||||||
void set_transform(transform_type const& );
|
void set_transform(transform_type const& );
|
||||||
transform_type const& get_transform() const;
|
transform_type const& get_transform() const;
|
||||||
std::string const& get_transform_string() const;
|
std::string const get_transform_string() const;
|
||||||
void set_opacity(float opacity);
|
void set_opacity(float opacity);
|
||||||
float get_opacity() const;
|
float get_opacity() const;
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -94,7 +94,7 @@ transform_type const& symbolizer_with_image::get_transform() const
|
||||||
return matrix_;
|
return matrix_;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string const& symbolizer_with_image::get_transform_string() const
|
std::string const symbolizer_with_image::get_transform_string() const
|
||||||
{
|
{
|
||||||
std::stringstream ss;
|
std::stringstream ss;
|
||||||
ss << "matrix(" << matrix_[0] << ", " << matrix_[1] << ", "
|
ss << "matrix(" << matrix_[0] << ", " << matrix_[1] << ", "
|
||||||
|
|
Loading…
Add table
Reference in a new issue