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

mapnik c++ style

Browse source
This commit is contained in:
artemp 2015-07-15 11:26:45 +02:00
parent 2b8abc4bfa
commit dfe73b7995
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/mapnik/grid/grid_pixfmt.hpp
View file

@ -38,7 +38,7 @@ namespace mapnik
{
//============================================================blender_gray
template<class ColorT> struct blender_gray
template<typename ColorT> struct blender_gray
{
using color_type = ColorT;
using value_type = typename color_type::value_type;
@ -55,7 +55,7 @@ template<class ColorT> struct blender_gray
//=====================================================apply_gamma_dir_gray
template<class ColorT, class GammaLut> class apply_gamma_dir_gray
template<typename ColorT, class GammaLut> class apply_gamma_dir_gray
{
public:
using value_type = typename ColorT::value_type;
@ -74,7 +74,7 @@ private:
//=====================================================apply_gamma_inv_gray
template<class ColorT, class GammaLut> class apply_gamma_inv_gray
template<typename ColorT, class GammaLut> class apply_gamma_inv_gray
{
public:
using value_type = typename ColorT::value_type;
@ -93,7 +93,7 @@ private:
//=================================================pixfmt_alpha_blend_gray
template<class Blender, class RenBuf, unsigned Step=1, unsigned Offset=0>
template<typename Blender, class RenBuf, unsigned Step=1, unsigned Offset=0>
class pixfmt_alpha_blend_gray
{
public:
@ -160,7 +160,7 @@ public:
void attach(rbuf_type& rb) { m_rbuf = &rb; }
//--------------------------------------------------------------------
template<class PixFmt>
template<typename PixFmt>
bool attach(PixFmt& pixf, int x1, int y1, int x2, int y2)
{
agg::rect_i r(x1, y1, x2, y2);
@ -538,10 +538,10 @@ public:
}
//--------------------------------------------------------------------
template<class Function> void for_each_pixel(Function f)
template <typename Function>
void for_each_pixel(Function f)
{
unsigned y;
for(y = 0; y < height(); ++y)
for(unsigned y = 0; y < height(); ++y)
{
row_data r = m_rbuf->row(y);
if(r.ptr)
@ -562,19 +562,19 @@ public:
}
//--------------------------------------------------------------------
template<class GammaLut> void apply_gamma_dir(const GammaLut& g)
template<typename GammaLut> void apply_gamma_dir(const GammaLut& g)
{
for_each_pixel(apply_gamma_dir_gray<color_type, GammaLut>(g));
}
//--------------------------------------------------------------------
template<class GammaLut> void apply_gamma_inv(const GammaLut& g)
template<typename GammaLut> void apply_gamma_inv(const GammaLut& g)
{
for_each_pixel(apply_gamma_inv_gray<color_type, GammaLut>(g));
}
//--------------------------------------------------------------------
template<class RenBuf2>
template<typename RenBuf2>
void copy_from(const RenBuf2& from,
int xdst, int ydst,
int xsrc, int ysrc,
@ -590,7 +590,7 @@ public:
}
//--------------------------------------------------------------------
template<class SrcPixelFormatRenderer>
template<typename SrcPixelFormatRenderer>
void blend_from_color(const SrcPixelFormatRenderer& from,
const color_type& color,
int xdst, int ydst,
@ -617,7 +617,7 @@ public:
}
//--------------------------------------------------------------------
template<class SrcPixelFormatRenderer>
template<typename SrcPixelFormatRenderer>
void blend_from_lut(const SrcPixelFormatRenderer& from,
const color_type* color_lut,
int xdst, int ydst,