From 791b90b9898cc41869538f1dfc303588436682b7 Mon Sep 17 00:00:00 2001 From: B Stack Date: Sat, 15 Feb 2020 11:50:31 -0500 Subject: add upstream 10.20 It is worth noting that the send email feature is not present in the GPL release. --- wx+/image_tools.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'wx+/image_tools.h') diff --git a/wx+/image_tools.h b/wx+/image_tools.h index e2d42fb0..3e401f73 100644 --- a/wx+/image_tools.h +++ b/wx+/image_tools.h @@ -38,6 +38,8 @@ wxImage layOver(const wxImage& back, const wxImage& front, int alignment = wxALI wxImage greyScale(const wxImage& img); //greyscale + brightness adaption wxBitmap greyScale(const wxBitmap& bmp); // +wxBitmap greyScaleIfDisabled(const wxBitmap& bmp, bool enabled); + //void moveImage(wxImage& img, int right, int up); void adjustBrightness(wxImage& img, int targetLevel); @@ -98,6 +100,16 @@ wxBitmap greyScale(const wxBitmap& bmp) } +inline +wxBitmap greyScaleIfDisabled(const wxBitmap& bmp, bool enabled) +{ + if (enabled) //avoid ternary WTF + return bmp; + else + return greyScale(bmp); +} + + inline double getAvgBrightness(const wxImage& img) { -- cgit