Merge branch 'develop' of https://github.com/nabijaczleweli/nana into nabijaczleweli-develop

This commit is contained in:
Jinhao 2016-01-31 10:41:19 +08:00
commit bfa96c0dc9

View File

@ -355,17 +355,17 @@ namespace paint
return (image_ptr_ ? &image::empty : nullptr); return (image_ptr_ ? &image::empty : nullptr);
} }
void image::close() void image::close() noexcept
{ {
image_ptr_.reset(); image_ptr_.reset();
} }
bool image::alpha() const bool image::alpha() const noexcept
{ {
return (image_ptr_ ? image_ptr_->alpha_channel() : false); return (image_ptr_ ? image_ptr_->alpha_channel() : false);
} }
nana::size image::size() const nana::size image::size() const noexcept
{ {
return (image_ptr_ ? image_ptr_->size() : nana::size()); return (image_ptr_ ? image_ptr_->size() : nana::size());
} }