diff options
Diffstat (limited to 'wx+/image_holder.h')
| -rwxr-xr-x | wx+/image_holder.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wx+/image_holder.h b/wx+/image_holder.h index 6804d5fc..f4bf3c8a 100755 --- a/wx+/image_holder.h +++ b/wx+/image_holder.h @@ -18,15 +18,15 @@ struct ImageHolder //prepare conversion to wxImage as much as possible while sta { ImageHolder() {} - ImageHolder(int w, int h, bool withAlpha) : //init with allocated memory + ImageHolder(int w, int h, bool withAlpha) : //init with memory allocated width_(w), height_(h), rgb_(static_cast<unsigned char*>(::malloc(w * h * 3))), alpha_(withAlpha ? static_cast<unsigned char*>(::malloc(w * h)) : nullptr) {} - ImageHolder (ImageHolder&& tmp) = default; // - ImageHolder& operator=(ImageHolder&& tmp) = default; //move semantics only! - ImageHolder (const ImageHolder&) = delete; // - ImageHolder& operator=(const ImageHolder&) = delete; // + ImageHolder (ImageHolder&&) noexcept = default; // + ImageHolder& operator=(ImageHolder&&) noexcept = default; //move semantics only! + ImageHolder (const ImageHolder&) = delete; // + ImageHolder& operator=(const ImageHolder&) = delete; // explicit operator bool() const { return rgb_.get() != nullptr; } |