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

support loading an icon from memory only on Windows (for now)

Browse Source
This commit is contained in:
beru 2016-06-20 14:24:15 +09:00
parent e7620ecaeb
commit 7fcbcc1ff2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/paint/image.cpp
View File

@ -358,10 +358,13 @@ namespace paint
else if (bytes > 9 && (0x66697845 == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+5))) //Exif else if (bytes > 9 && (0x66697845 == *reinterpret_cast<const unsigned*>(reinterpret_cast<const char*>(data)+5))) //Exif
ptr = std::make_shared<detail::image_jpeg>(); ptr = std::make_shared<detail::image_jpeg>();
#endif #endif
#if defined(NANA_WINDOWS)
// suppose icon data is bitmap data // suppose icon data is bitmap data
if (!ptr && bytes > 40 /* sizeof(BITMAPINFOHEADER) */ && (40 == *reinterpret_cast<const uint32_t*>(data))) { if (!ptr && bytes > 40 /* sizeof(BITMAPINFOHEADER) */ && (40 == *reinterpret_cast<const uint32_t*>(data))) {
ptr = std::make_shared<detail::image_ico>(true); ptr = std::make_shared<detail::image_ico>(true);
} }
#endif
} }
} }