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

Added multi platform support for ICOns files.

Browse Source
This commit is contained in:
dankan1890
2016-10-18 00:32:58 +02:00
parent 47b2234932
commit afa9cffd51
3 changed files with 272 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/paint/image.cpp
View File

@@ -35,6 +35,7 @@
#include "detail/image_ico.hpp"
#include "image_accessor.hpp"
#include "detail/image_ico_ex.hpp"
namespace fs = std::experimental::filesystem;
@@ -264,11 +265,7 @@ namespace paint
{
if (ext_ico == ext)
{
#if defined(NANA_WINDOWS)
ptr = std::make_shared<detail::image_ico>(true);
#else
return ptr;
#endif
ptr = std::make_shared<detail::image_ico_ex>();
break;
}
@@ -367,6 +364,8 @@ namespace paint
ptr = std::make_shared<detail::image_ico>(true);
}
#endif
else if (!ptr && bytes > 40 && (0x00010000 == *reinterpret_cast<const unsigned*>(data)))
ptr = std::make_shared<detail::image_ico_ex>();
}
}