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

c++11 - use c++ style casts + cleanups + use std::fill

Browse source
This commit is contained in:
artemp 2014-10-21 14:51:27 +01:00
parent 27c959b1bf
commit 107bad002d
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/mapnik/image_data.hpp
View file

@ -29,6 +29,7 @@
// stl // stl
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
#include <algorithm>
#include <stdexcept> #include <stdexcept>
namespace mapnik namespace mapnik
@ -52,7 +53,7 @@ public:
{ {
throw std::runtime_error("negative height not allowed for image_data"); throw std::runtime_error("negative height not allowed for image_data");
} }
pData_ = (width!=0 && height!=0)? static_cast<T*>(::operator new(sizeof(T)*width*height)):0; pData_ = (width!=0 && height!=0) ? static_cast<T*>(::operator new(sizeof(T) * width * height)):0;
if (pData_) std::memset(pData_,0,sizeof(T)*width_*height_); if (pData_) std::memset(pData_,0,sizeof(T)*width_*height_);
} }
@ -123,16 +124,9 @@ public:
{ {
return height_; return height_;
} }
inline void set(const T& t) inline void set(T const& t)
{ {
for (unsigned y = 0; y < height_; ++y) std::fill(pData_, pData_ + width_ * height_, t);
{
T * row = getRow(y);
for (unsigned x = 0; x < width_; ++x)
{
row[x] = t;
}
}
} }
inline const T* getData() const inline const T* getData() const
@ -147,12 +141,12 @@ public:
inline const unsigned char* getBytes() const inline const unsigned char* getBytes() const
{ {
return (unsigned char*)pData_; return reinterpret_cast<unsigned char*>(pData_);
} }
inline unsigned char* getBytes() inline unsigned char* getBytes()
{ {
return (unsigned char*)pData_; return reinterpret_cast<unsigned char*>(pData_);
} }
inline const T* getRow(unsigned row) const inline const T* getRow(unsigned row) const
@ -165,15 +159,15 @@ public:
return pData_+row*width_; return pData_+row*width_;
} }
inline void setRow(unsigned row,const T* buf,unsigned size) inline void setRow(unsigned row,const T* buf, unsigned size)
{ {
assert(row<height_); assert(row<height_);
assert(size<=width_); assert(size<=width_);
std::memcpy(pData_+row*width_,buf,size*sizeof(T)); std::memcpy(pData_ + row * width_, buf, size * sizeof(T));
} }
inline void setRow(unsigned row,unsigned x0,unsigned x1,const T* buf) inline void setRow(unsigned row, unsigned x0, unsigned x1, T const* buf)
{ {
std::memcpy(pData_+row*width_+x0,buf,(x1-x0)*sizeof(T)); std::memcpy(pData_+row * width_ + x0, buf, (x1 - x0) * sizeof(T));
} }
inline ~ImageData() inline ~ImageData()