diff options
| author | B Stack <bgstack15@gmail.com> | 2018-09-10 02:46:25 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-09-10 02:46:25 +0000 |
| commit | 728d32e6da9ce66968f8eef47a59505d613e2c1b (patch) | |
| tree | 0f0441755ff0e6d65e12222d4502c648bffd6a7c /wx+/image_tools.h | |
| parent | 10.3 (diff) | |
| parent | pull in latest 10.4 from upstream (diff) | |
| download | FreeFileSync-e00e9e9910726f61b7eec25c042fc7b94b08647a.tar.gz FreeFileSync-e00e9e9910726f61b7eec25c042fc7b94b08647a.tar.bz2 FreeFileSync-e00e9e9910726f61b7eec25c042fc7b94b08647a.zip | |
Merge branch '10.4' into 'master'10.4
pull in latest 10.4 from upstream
See merge request opensource-tracking/FreeFileSync!1
Diffstat (limited to 'wx+/image_tools.h')
| -rwxr-xr-x | wx+/image_tools.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wx+/image_tools.h b/wx+/image_tools.h index ca82a031..06d7f0ba 100755 --- a/wx+/image_tools.h +++ b/wx+/image_tools.h @@ -34,7 +34,7 @@ wxImage stackImages(const wxImage& img1, const wxImage& img2, ImageStackLayout d wxImage createImageFromText(const wxString& text, const wxFont& font, const wxColor& col, ImageStackAlignment textAlign = ImageStackAlignment::LEFT); //CENTER/LEFT/RIGHT -wxBitmap layOver(const wxBitmap& background, const wxBitmap& foreground, int alignment = wxALIGN_CENTER); +wxBitmap layOver(const wxBitmap& back, const wxBitmap& front, int alignment = wxALIGN_CENTER); wxImage greyScale(const wxImage& img); //greyscale + brightness adaption wxBitmap greyScale(const wxBitmap& bmp); // |