Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxImage Change{Saturation,Brightness,HSV,Lightness}()

Browse Source 
Add more functions for manipulating wxImage colours.

Show using them in the same and add new unit tests for them.

This is a squashed commit of branch 'tomay3000/image-lightness'.

Closes https://github.com/wxWidgets/wxWidgets/pull/2310
This commit is contained in:
Tomay
2021-05-01 14:03:04 +02:00
committed by Vadim Zeitlin
parent 3217a4e8a2
commit 0e39566b3a
20 changed files with 626 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/wx/image.h
View File

@@ -411,6 +411,9 @@ public:
// Convert to disabled (dimmed) image.
wxImage ConvertToDisabled(unsigned char brightness = 255) const;
// Convert the image based on the given lightness.
wxImage ChangeLightness(int alpha) const;
// these routines are slow but safe
void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
void SetRGB( const wxRect& rect, unsigned char r, unsigned char g, unsigned char b );
@@ -555,10 +558,30 @@ public:
// Returned value: # of entries in the histogram
unsigned long ComputeHistogram( wxImageHistogram &h ) const;
// Rotates the hue of each pixel of the image. angle is a double in the range
// -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees
// Rotates the hue of each pixel in the image by angle, which is a double in
// the range [-1.0..+1.0], where -1.0 corresponds to -360 degrees and +1.0
// corresponds to +360 degrees.
void RotateHue(double angle);
// Changes the saturation of each pixel in the image. factor is a double in
// the range [-1.0..+1.0], where -1.0 corresponds to -100 percent and +1.0
// corresponds to +100 percent.
void ChangeSaturation(double factor);
// Changes the brightness (value) of each pixel in the image. factor is a
// double in the range [-1.0..+1.0], where -1.0 corresponds to -100 percent
// and +1.0 corresponds to +100 percent.
void ChangeBrightness(double factor);
// Changes the hue, the saturation and the brightness (value) of each pixel
// in the image. angleH is a double in the range [-1.0..+1.0], where -1.0
// corresponds to -360 degrees and +1.0 corresponds to +360 degrees, factorS
// is a double in the range [-1.0..+1.0], where -1.0 corresponds to -100
// percent and +1.0 corresponds to +100 percent and factorV is a double in
// the range [-1.0..+1.0], where -1.0 corresponds to -100 percent and +1.0
// corresponds to +100 percent.
void ChangeHSV(double angleH, double factorS, double factorV);
static wxList& GetHandlers() { return sm_handlers; }
static void AddHandler( wxImageHandler *handler );
static void InsertHandler( wxImageHandler *handler );
@@ -649,6 +672,10 @@ protected:
virtual wxObjectRefData* CreateRefData() const wxOVERRIDE;
virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const wxOVERRIDE;
// Helper function used internally by wxImage class only.
template <typename T>
void ApplyToAllPixels(void (*filter)(wxImage *, unsigned char *, T), T value);
private:
friend class WXDLLIMPEXP_FWD_CORE wxImageHandler;