diff options
| author | Daniel Wilhelm <shieldwed@outlook.com> | 2019-12-14 15:52:53 +0000 |
|---|---|---|
| committer | Daniel Wilhelm <shieldwed@outlook.com> | 2019-12-14 15:52:53 +0000 |
| commit | cc75e50ca861529d50601d247fd66f806fcb23a8 (patch) | |
| tree | e2c5c7b1f98e64011b1ee8ca4e9bb9157510dfe7 /wx+/image_tools.h | |
| parent | Merge branch '10.17' into 'master' (diff) | |
| parent | add upstream 10.18 (diff) | |
| download | FreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.tar.gz FreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.tar.bz2 FreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.zip | |
Merge branch '10.18' into 'master'10.18
add upstream 10.18
See merge request opensource-tracking/FreeFileSync!15
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 2a0dd0d4..d72597ef 100644 --- 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& back, const wxBitmap& front, int alignment = wxALIGN_CENTER); +wxImage layOver(const wxImage& back, const wxImage& front, int alignment = wxALIGN_CENTER); wxImage greyScale(const wxImage& img); //greyscale + brightness adaption wxBitmap greyScale(const wxBitmap& bmp); // @@ -213,7 +213,7 @@ wxColor gradient(const wxColor& from, const wxColor& to, double fraction) inline wxColor hsvColor(double h, double s, double v) //h within [0, 360), s, v within [0, 1] { - //https://de.wikipedia.org/wiki/HSV-Farbraum + //https://en.wikipedia.org/wiki/HSL_and_HSV //make input values fit into bounds if (h > 360) |