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

fix compile of svg output renderer

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-03 12:01:14 -08:00
parent 8da2158781
commit 271e8468fd
2 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
include/mapnik/svg/output/svg_output_attributes.hpp
View file

@ -59,23 +59,23 @@ namespace mapnik { namespace svg {
{} {}
void set_fill_color(color const& fill_color); void set_fill_color(color const& fill_color);
void set_fill_opacity(const double fill_opacity); void set_fill_opacity(double fill_opacity);
void set_stroke_color(color const& stroke_color); void set_stroke_color(color const& stroke_color);
void set_stroke_opacity(const double stroke_opacity); void set_stroke_opacity(double stroke_opacity);
void set_stroke_width(const double stroke_width); void set_stroke_width(double stroke_width);
void set_stroke_linecap(const line_cap_e stroke_linecap); void set_stroke_linecap(line_cap_e stroke_linecap);
void set_stroke_linejoin(const line_join_e stroke_linejoin); void set_stroke_linejoin(line_join_e stroke_linejoin);
void set_stroke_dasharray(const dash_array stroke_dasharray); void set_stroke_dasharray(dash_array const& stroke_dasharray);
void set_stroke_dashoffset(const double stroke_dashoffset); void set_stroke_dashoffset(double stroke_dashoffset);
std::string fill_color() const; std::string const& fill_color() const;
double fill_opacity() const; double fill_opacity() const;
std::string stroke_color() const; std::string const& stroke_color() const;
double stroke_opacity() const; double stroke_opacity() const;
double stroke_width() const; double stroke_width() const;
std::string stroke_linecap() const; std::string const& stroke_linecap() const;
std::string stroke_linejoin() const; std::string const& stroke_linejoin() const;
dash_array stroke_dasharray() const; dash_array const& stroke_dasharray() const;
double stroke_dashoffset() const; double stroke_dashoffset() const;
/*! /*!
@ -138,7 +138,7 @@ namespace mapnik { namespace svg {
int y() const; int y() const;
int width() const; int width() const;
int height() const; int height() const;
std::string fill_color() const; std::string const& fill_color() const;
/*! /*!
* @brief Set members back to their default values. * @brief Set members back to their default values.
@ -172,13 +172,13 @@ namespace mapnik { namespace svg {
void set_width(const unsigned width); void set_width(const unsigned width);
void set_height(const unsigned height); void set_height(const unsigned height);
void set_svg_version(const double svg_version); void set_svg_version(double svg_version);
void set_svg_namespace_url(std::string const& svg_namespace_url); void set_svg_namespace_url(std::string const& svg_namespace_url);
unsigned width() const; unsigned width() const;
unsigned height() const; unsigned height() const;
double svg_version() const; double svg_version() const;
std::string svg_namespace_url() const; std::string const& svg_namespace_url() const;
/*! /*!
* @brief Set members back to their default values. * @brief Set members back to their default values.

66
src/svg/output/svg_output_attributes.cpp
View file

@ -33,7 +33,7 @@ namespace mapnik { namespace svg {
fill_color_ = fill_color.to_hex_string(); fill_color_ = fill_color.to_hex_string();
} }
void path_output_attributes::set_fill_opacity(const double fill_opacity) void path_output_attributes::set_fill_opacity(double fill_opacity)
{ {
fill_opacity_ = fill_opacity; fill_opacity_ = fill_opacity;
} }
@ -43,17 +43,17 @@ namespace mapnik { namespace svg {
stroke_color_ = stroke_color.to_hex_string(); stroke_color_ = stroke_color.to_hex_string();
} }
void path_output_attributes::set_stroke_opacity(const double stroke_opacity) void path_output_attributes::set_stroke_opacity(double stroke_opacity)
{ {
stroke_opacity_ = stroke_opacity; stroke_opacity_ = stroke_opacity;
} }
void path_output_attributes::set_stroke_width(const double stroke_width) void path_output_attributes::set_stroke_width(double stroke_width)
{ {
stroke_width_ = stroke_width; stroke_width_ = stroke_width;
} }
void path_output_attributes::set_stroke_linecap(const line_cap_e stroke_linecap) void path_output_attributes::set_stroke_linecap(line_cap_e stroke_linecap)
{ {
switch(stroke_linecap) switch(stroke_linecap)
{ {
@ -71,7 +71,7 @@ namespace mapnik { namespace svg {
} }
} }
void path_output_attributes::set_stroke_linejoin(const line_join_e stroke_linejoin) void path_output_attributes::set_stroke_linejoin(line_join_e stroke_linejoin)
{ {
switch(stroke_linejoin) switch(stroke_linejoin)
{ {
@ -92,57 +92,57 @@ namespace mapnik { namespace svg {
} }
} }
void path_output_attributes::set_stroke_dasharray(const dash_array stroke_dasharray) void path_output_attributes::set_stroke_dasharray(dash_array const& stroke_dasharray)
{ {
stroke_dasharray_ = stroke_dasharray; stroke_dasharray_ = stroke_dasharray;
} }
void path_output_attributes::set_stroke_dashoffset(const double stroke_dashoffset) void path_output_attributes::set_stroke_dashoffset(double stroke_dashoffset)
{ {
stroke_dashoffset_ = stroke_dashoffset; stroke_dashoffset_ = stroke_dashoffset;
} }
const std::string path_output_attributes::fill_color() const std::string const& path_output_attributes::fill_color() const
{ {
return fill_color_; return fill_color_;
} }
const double path_output_attributes::fill_opacity() const double path_output_attributes::fill_opacity() const
{ {
return fill_opacity_; return fill_opacity_;
} }
const std::string path_output_attributes::stroke_color() const std::string const& path_output_attributes::stroke_color() const
{ {
return stroke_color_; return stroke_color_;
} }
const double path_output_attributes::stroke_opacity() const double path_output_attributes::stroke_opacity() const
{ {
return stroke_opacity_; return stroke_opacity_;
} }
const double path_output_attributes::stroke_width() const double path_output_attributes::stroke_width() const
{ {
return stroke_width_; return stroke_width_;
} }
const std::string path_output_attributes::stroke_linecap() const std::string const& path_output_attributes::stroke_linecap() const
{ {
return stroke_linecap_; return stroke_linecap_;
} }
const std::string path_output_attributes::stroke_linejoin() const std::string const& path_output_attributes::stroke_linejoin() const
{ {
return stroke_linejoin_; return stroke_linejoin_;
} }
const dash_array path_output_attributes::stroke_dasharray() const dash_array const& path_output_attributes::stroke_dasharray() const
{ {
return stroke_dasharray_; return stroke_dasharray_;
} }
const double path_output_attributes::stroke_dashoffset() const double path_output_attributes::stroke_dashoffset() const
{ {
return stroke_dashoffset_; return stroke_dashoffset_;
} }
@ -162,22 +162,22 @@ namespace mapnik { namespace svg {
// rect_output_attributes // rect_output_attributes
void rect_output_attributes::set_x(const int x) void rect_output_attributes::set_x(int x)
{ {
x_ = x; x_ = x;
} }
void rect_output_attributes::set_y(const int y) void rect_output_attributes::set_y(int y)
{ {
y_ = y; y_ = y;
} }
void rect_output_attributes::set_width(const unsigned width) void rect_output_attributes::set_width(unsigned width)
{ {
width_ = width; width_ = width;
} }
void rect_output_attributes::set_height(const unsigned height) void rect_output_attributes::set_height(unsigned height)
{ {
height_ = height; height_ = height;
} }
@ -187,27 +187,27 @@ namespace mapnik { namespace svg {
fill_color_ = fill_color.to_hex_string(); fill_color_ = fill_color.to_hex_string();
} }
const int rect_output_attributes::x() const int rect_output_attributes::x() const
{ {
return x_; return x_;
} }
const int rect_output_attributes::y() const int rect_output_attributes::y() const
{ {
return y_; return y_;
} }
const int rect_output_attributes::width() const int rect_output_attributes::width() const
{ {
return width_; return width_;
} }
const int rect_output_attributes::height() const int rect_output_attributes::height() const
{ {
return height_; return height_;
} }
const std::string rect_output_attributes::fill_color() const std::string const& rect_output_attributes::fill_color() const
{ {
return fill_color_; return fill_color_;
} }
@ -233,24 +233,24 @@ namespace mapnik { namespace svg {
svg_namespace_url_(SVG_NAMESPACE_URL) svg_namespace_url_(SVG_NAMESPACE_URL)
{} {}
root_output_attributes::root_output_attributes(const unsigned width, const unsigned height) root_output_attributes::root_output_attributes(unsigned width, unsigned height)
: width_(width), : width_(width),
height_(height), height_(height),
svg_version_(SVG_VERSION), svg_version_(SVG_VERSION),
svg_namespace_url_(SVG_NAMESPACE_URL) svg_namespace_url_(SVG_NAMESPACE_URL)
{} {}
void root_output_attributes::set_width(const unsigned width) void root_output_attributes::set_width(unsigned width)
{ {
width_ = width; width_ = width;
} }
void root_output_attributes::set_height(const unsigned height) void root_output_attributes::set_height(unsigned height)
{ {
height_ = height; height_ = height;
} }
void root_output_attributes::set_svg_version(const double svg_version) void root_output_attributes::set_svg_version(double svg_version)
{ {
svg_version_ = svg_version; svg_version_ = svg_version;
} }
@ -260,22 +260,22 @@ namespace mapnik { namespace svg {
svg_namespace_url_ = svg_namespace_url; svg_namespace_url_ = svg_namespace_url;
} }
const unsigned root_output_attributes::width() const unsigned root_output_attributes::width() const
{ {
return width_; return width_;
} }
const unsigned root_output_attributes::height() const unsigned root_output_attributes::height() const
{ {
return height_; return height_;
} }
const double root_output_attributes::svg_version() const double root_output_attributes::svg_version() const
{ {
return svg_version_; return svg_version_;
} }
const std::string root_output_attributes::svg_namespace_url() const std::string const& root_output_attributes::svg_namespace_url() const
{ {
return svg_namespace_url_; return svg_namespace_url_;
} }