From 8ea8322fc3a198e25ee3dd88e472a40cb1ab4f60 Mon Sep 17 00:00:00 2001 From: nabijaczleweli Date: Wed, 27 Jan 2016 17:42:21 +0100 Subject: [PATCH] Fix different exception specifiers in image.cpp --- source/paint/image.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/paint/image.cpp b/source/paint/image.cpp index 53740476..ee77a0bb 100644 --- a/source/paint/image.cpp +++ b/source/paint/image.cpp @@ -308,7 +308,7 @@ namespace paint std::shared_ptr ptr; auto meta = *reinterpret_cast(data); - + if (*reinterpret_cast("BM") == meta) ptr = std::make_shared(); else if (*reinterpret_cast("MZ") == meta) @@ -355,17 +355,17 @@ namespace paint return (image_ptr_ ? &image::empty : nullptr); } - void image::close() + void image::close() noexcept { image_ptr_.reset(); } - bool image::alpha() const + bool image::alpha() const noexcept { 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()); }