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

transform_expression - add default ctors

Browse source
This commit is contained in:
artemp 2015-12-04 12:43:55 +00:00
parent dca41aea12
commit 8200e1ffc7
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/mapnik/transform_expression.hpp
View file

@ -53,6 +53,8 @@ struct matrix_node
expr_node e_; expr_node e_;
expr_node f_; expr_node f_;
matrix_node() = default;
template <typename T> template <typename T>
explicit matrix_node(T const& m) explicit matrix_node(T const& m)
: a_(m.sx), b_(m.shy), c_(m.shx), d_(m.sy), e_(m.tx), f_(m.ty) {} : a_(m.sx), b_(m.shy), c_(m.shx), d_(m.sy), e_(m.tx), f_(m.ty) {}
@ -67,6 +69,8 @@ struct translate_node
expr_node tx_; expr_node tx_;
expr_node ty_; expr_node ty_;
translate_node() = default;
translate_node(expr_node const& tx, translate_node(expr_node const& tx,
boost::optional<expr_node> const& ty) boost::optional<expr_node> const& ty)
: tx_(tx) : tx_(tx)
@ -78,6 +82,8 @@ struct scale_node
expr_node sx_; expr_node sx_;
expr_node sy_; expr_node sy_;
scale_node() = default;
scale_node(expr_node const& sx, scale_node(expr_node const& sx,
boost::optional<expr_node> const& sy) boost::optional<expr_node> const& sy)
: sx_(sx) : sx_(sx)
@ -92,6 +98,8 @@ struct rotate_node
expr_node cx_; expr_node cx_;
expr_node cy_; expr_node cy_;
rotate_node() = default;
explicit rotate_node(expr_node const& angle) explicit rotate_node(expr_node const& angle)
: angle_(angle) {} : angle_(angle) {}
@ -121,16 +129,16 @@ struct rotate_node
struct skewX_node struct skewX_node
{ {
expr_node angle_; expr_node angle_;
skewX_node() = default;
explicit skewX_node(expr_node const& angle) skewX_node(expr_node const& angle)
: angle_(angle) {} : angle_(angle) {}
}; };
struct skewY_node struct skewY_node
{ {
expr_node angle_; expr_node angle_;
skewY_node() = default;
explicit skewY_node(expr_node const& angle) skewY_node(expr_node const& angle)
: angle_(angle) {} : angle_(angle) {}
}; };