diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2015-10-02 14:57:46 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2015-10-02 14:57:46 +0200 |
| commit | ad4e3d2c55e75193c41356c23619f80add41db18 (patch) | |
| tree | dd836d120f50e472106e04968ef8185c25e4242e /wx+/image_tools.h | |
| parent | 7.4 (diff) | |
| download | FreeFileSync-ad4e3d2c55e75193c41356c23619f80add41db18.tar.gz FreeFileSync-ad4e3d2c55e75193c41356c23619f80add41db18.tar.bz2 FreeFileSync-ad4e3d2c55e75193c41356c23619f80add41db18.zip | |
7.5
Diffstat (limited to 'wx+/image_tools.h')
| -rw-r--r-- | wx+/image_tools.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wx+/image_tools.h b/wx+/image_tools.h index 5e21bd40..43c1a625 100644 --- a/wx+/image_tools.h +++ b/wx+/image_tools.h @@ -33,7 +33,7 @@ wxImage stackImages(const wxImage& img1, const wxImage& img2, ImageStackLayout d wxImage createImageFromText(const wxString& text, const wxFont& font, const wxColor& col); -wxBitmap layOver(const wxBitmap& foreground, const wxBitmap& background); //merge +wxBitmap layOver(const wxBitmap& background, const wxBitmap& foreground); //merge wxImage greyScale(const wxImage& img); //greyscale + brightness adaption wxBitmap greyScale(const wxBitmap& bmp); // @@ -147,7 +147,7 @@ void adjustBrightness(wxImage& img, int targetLevel) inline -wxBitmap layOver(const wxBitmap& foreground, const wxBitmap& background) +wxBitmap layOver(const wxBitmap& background, const wxBitmap& foreground) { assert(foreground.HasAlpha() == background.HasAlpha()); //we don't support mixed-mode brittleness! |