-
-
Save nabijaczleweli/12b174fd1e03ff09f1ed to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[40/71] Building CXX object CMakeFiles/nana.dir/source/paint/image.cpp.obj | |
FAILED: d:\Programy\Programowanie\msys2\mingw64\bin\c++.exe -DMINGW -DNANA_UNICODE -DWIN32 -I../include -std=gnu++14 -MMD -MT CMakeFiles/nana.dir/source/paint/image.cpp.obj -MF CMakeFiles/nana.dir/source/paint/image.cpp.obj.d -o CMakeFiles/nana.dir/source/paint/image.cpp.obj -c ../source/paint/image.cpp | |
../source/paint/image.cpp:358:21: error: declaration of 'void nana::paint::image::close()' has a different exception specifier | |
void image::close() | |
^ | |
In file included from ../include/nana/detail/win32/platform_spec.hpp:22:0, | |
from ../include/nana/detail/platform_spec_selector.hpp:18, | |
from ../source/paint/image.cpp:13: | |
../include/nana/paint/image.hpp:47:8: error: from previous declaration 'void nana::paint::image::close() noexcept' | |
void close() noexcept; | |
^ | |
../source/paint/image.cpp:363:23: error: declaration of 'bool nana::paint::image::alpha() const' has a different exception specifier | |
bool image::alpha() const | |
^ | |
In file included from ../include/nana/detail/win32/platform_spec.hpp:22:0, | |
from ../include/nana/detail/platform_spec_selector.hpp:18, | |
from ../source/paint/image.cpp:13: | |
../include/nana/paint/image.hpp:49:8: error: from previous declaration 'bool nana::paint::image::alpha() const noexcept' | |
bool alpha() const noexcept; | |
^ | |
../source/paint/image.cpp:368:28: error: declaration of 'nana::size nana::paint::image::size() const' has a different exception specifier | |
nana::size image::size() const | |
^ | |
In file included from ../include/nana/detail/win32/platform_spec.hpp:22:0, | |
from ../include/nana/detail/platform_spec_selector.hpp:18, | |
from ../source/paint/image.cpp:13: | |
../include/nana/paint/image.hpp:50:14: error: from previous declaration 'nana::size nana::paint::image::size() const noexcept' | |
nana::size size() const noexcept; | |
^ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/source/paint/image.cpp b/source/paint/image.cpp | |
index 5374047639a6da910dd61d4493c3fd568b0fb8b2..ee77a0bb4f5dea9b705fec56dfd87d0544d676a6 100644 | |
--- a/source/paint/image.cpp | |
+++ b/source/paint/image.cpp | |
@@ -308,7 +308,7 @@ namespace paint | |
std::shared_ptr<image::image_impl_interface> ptr; | |
auto meta = *reinterpret_cast<const unsigned short*>(data); | |
- | |
+ | |
if (*reinterpret_cast<const short*>("BM") == meta) | |
ptr = std::make_shared<detail::image_bmp>(); | |
else if (*reinterpret_cast<const short*>("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()); | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment