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

image : fix buffer's copy ctor - only std::copy when rhs owns the data (#3152)

Browse source
This commit is contained in:
artemp 2015-10-30 16:47:26 +00:00
parent 34f5b56003
commit cb31692f37
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/image.cpp
View file

@ -59,10 +59,11 @@ buffer::buffer(buffer && rhs) noexcept
// copy // copy
buffer::buffer(buffer const& rhs) buffer::buffer(buffer const& rhs)
: size_(rhs.size_), : size_(rhs.size_),
data_(static_cast<unsigned char*>(size_ != 0 ? ::operator new(size_) : nullptr)), data_(static_cast<unsigned char*>((rhs.owns_ && size_ != 0) ? ::operator new(size_) : nullptr)),
owns_(true) owns_(rhs.owns_)
{ {
if (data_) std::copy(rhs.data_, rhs.data_ + rhs.size_, data_); if (data_) std::copy(rhs.data_, rhs.data_ + rhs.size_, data_);
else data_ = rhs.data_;
} }
buffer::~buffer() buffer::~buffer()