diff options
| author | B Stack <bgstack15@gmail.com> | 2018-11-15 11:22:00 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-11-15 11:22:00 +0000 |
| commit | 77c5c2503d459288720a8894349ac74e5eeec7c6 (patch) | |
| tree | 30bf08d782d58174a0ca212b2e4b172fabd9c42c /wx+/image_holder.h | |
| parent | Merge branch '10.5' into 'master' (diff) | |
| parent | 10.6 (diff) | |
| download | FreeFileSync-77c5c2503d459288720a8894349ac74e5eeec7c6.tar.gz FreeFileSync-77c5c2503d459288720a8894349ac74e5eeec7c6.tar.bz2 FreeFileSync-77c5c2503d459288720a8894349ac74e5eeec7c6.zip | |
Merge branch '10.6' into 'master'10.6
10.6
See merge request opensource-tracking/FreeFileSync!3
Diffstat (limited to 'wx+/image_holder.h')
| -rwxr-xr-x | wx+/image_holder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wx+/image_holder.h b/wx+/image_holder.h index aada581f..b11ae451 100755 --- a/wx+/image_holder.h +++ b/wx+/image_holder.h @@ -39,9 +39,9 @@ struct ImageHolder //prepare conversion to wxImage as much as possible while sta unsigned char* releaseRgb () { return rgb_ .release(); } unsigned char* releaseAlpha() { return alpha_.release(); } +private: struct CLibFree { void operator()(unsigned char* p) const { ::free(p); } }; //use malloc/free to allow direct move into wxImage! -private: int width_ = 0; int height_ = 0; std::unique_ptr<unsigned char, CLibFree> rgb_; //optional |