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

merge beru's changes

Browse Source
This commit is contained in:
Jinhao
2015-08-02 03:33:43 +08:00
parent 66c1e1ad98
commit e0ee42d184
18 changed files with 59 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/paint/detail/image_bmp.hpp
View File

@@ -75,7 +75,7 @@ namespace nana{ namespace paint
this->close();
}
bool open(const void* data, std::size_t bytes)
bool open(const void* data, std::size_t bytes) override
{
// TODO: read a BMP file from memory
return false;

2
source/paint/detail/image_ico.hpp
View File

@@ -24,7 +24,7 @@ namespace nana{ namespace paint
bool open(const nana::char_t* filename) override;
bool open(const void* data, std::size_t bytes);
bool open(const void* data, std::size_t bytes) override;
bool alpha_channel() const override;
bool empty() const override;
void close() override;