mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jinhao 2016-01-31 10:41:19 +08:00
commit bfa96c0dc9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/paint/image.cpp
View File

@ -308,7 +308,7 @@ namespace paint
std::shared_ptr<image::image_impl_interface> ptr; std::shared_ptr<image::image_impl_interface> ptr;
auto meta = *reinterpret_cast<const unsigned short*>(data); auto meta = *reinterpret_cast<const unsigned short*>(data);
if (*reinterpret_cast<const short*>("BM") == meta) if (*reinterpret_cast<const short*>("BM") == meta)
ptr = std::make_shared<detail::image_bmp>(); ptr = std::make_shared<detail::image_bmp>();
else if (*reinterpret_cast<const short*>("MZ") == meta) else if (*reinterpret_cast<const short*>("MZ") == meta)
@ -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());
} }