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

+ use uint8_t in get/set methods

Browse source 
+ update to_string/to_hexstring
This commit is contained in:
artemp 2013-01-03 13:51:16 +00:00
parent 7d3dca725e
commit 6558c5c315
2 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/mapnik/color.hpp
View file

@ -53,7 +53,7 @@ public:
alpha_(0xff) alpha_(0xff)
{} {}
color(unsigned red, unsigned green, unsigned blue, unsigned alpha = 0xff) color(boost::uint8_t red, boost::uint8_t green, boost::uint8_t blue, boost::uint8_t alpha = 0xff)
: red_(red), : red_(red),
green_(green), green_(green),
blue_(blue), blue_(blue),
@ -95,38 +95,38 @@ public:
(alpha_ == rhs.alpha()); (alpha_ == rhs.alpha());
} }
inline unsigned red() const inline boost::uint8_t red() const
{ {
return red_; return red_;
} }
inline unsigned green() const inline boost::uint8_t green() const
{ {
return green_; return green_;
} }
inline unsigned blue() const inline boost::uint8_t blue() const
{ {
return blue_; return blue_;
} }
inline unsigned alpha() const inline boost::uint8_t alpha() const
{ {
return alpha_; return alpha_;
} }
inline void set_red(unsigned red) inline void set_red(boost::uint8_t red)
{ {
red_ = red; red_ = red;
} }
inline void set_green(unsigned green) inline void set_green(boost::uint8_t green)
{ {
green_ = green; green_ = green;
} }
inline void set_blue(unsigned blue) inline void set_blue(boost::uint8_t blue)
{ {
blue_ = blue; blue_ = blue;
} }
inline void set_alpha(unsigned alpha) inline void set_alpha(boost::uint8_t alpha)
{ {
alpha_ = alpha; alpha_ = alpha;
} }

29
src/color.cpp
View file

@ -47,17 +47,17 @@ std::string color::to_string() const
if (alpha_ == 255) if (alpha_ == 255)
{ {
ss << "rgb(" ss << "rgb("
<< red() << "," << static_cast<unsigned>(red()) << ","
<< green() << "," << static_cast<unsigned>(green()) << ","
<< blue() << ")"; << static_cast<unsigned>(blue()) << ")";
} }
else else
{ {
ss << "rgba(" ss << "rgba("
<< red() << "," << static_cast<unsigned>(red()) << ","
<< green() << "," << static_cast<unsigned>(green()) << ","
<< blue() << "," << static_cast<unsigned>(blue()) << ","
<< alpha()/255.0 << ")"; << alpha() / 255.0 << ")";
} }
return ss.str(); return ss.str();
} }
@ -67,17 +67,17 @@ std::string color::to_hex_string() const
if (alpha_ == 255 ) if (alpha_ == 255 )
{ {
return (boost::format("#%1$02x%2$02x%3$02x") return (boost::format("#%1$02x%2$02x%3$02x")
% red() % static_cast<unsigned>(red())
% green() % static_cast<unsigned>(green())
% blue() ).str(); % static_cast<unsigned>(blue())).str();
} }
else else
{ {
return (boost::format("#%1$02x%2$02x%3$02x%4$02x") return (boost::format("#%1$02x%2$02x%3$02x%4$02x")
% red() % static_cast<unsigned>(red())
% green() % static_cast<unsigned>(green())
% blue() % static_cast<unsigned>(blue())
% alpha()).str(); % static_cast<unsigned>(alpha())).str();
} }
} }
@ -101,4 +101,3 @@ void color::demultiply()
} }
} }