summaryrefslogtreecommitdiff
path: root/wx+/image_tools.h
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2016-03-16 21:32:07 +0100
committerDaniel Wilhelm <daniel@wili.li>2016-03-16 21:32:07 +0100
commitce3574cf7ff2ee68608b4d001f5a6dd1e36b2252 (patch)
tree576b1741351e1cd34f0fcce49f98df9c17e10912 /wx+/image_tools.h
parent7.6 (diff)
downloadFreeFileSync-ce3574cf7ff2ee68608b4d001f5a6dd1e36b2252.tar.gz
FreeFileSync-ce3574cf7ff2ee68608b4d001f5a6dd1e36b2252.tar.bz2
FreeFileSync-ce3574cf7ff2ee68608b4d001f5a6dd1e36b2252.zip
7.7
Diffstat (limited to 'wx+/image_tools.h')
-rw-r--r--wx+/image_tools.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/wx+/image_tools.h b/wx+/image_tools.h
index 5e99653c..554e7b49 100644
--- a/wx+/image_tools.h
+++ b/wx+/image_tools.h
@@ -50,7 +50,7 @@ void convertToVanillaImage(wxImage& img); //add alpha channel if missing + remov
//wxColor gradient(const wxColor& from, const wxColor& to, double fraction); //maps fraction within [0, 1] to an intermediate color
-//wxColour hsvColor(double h, double s, double v); //h within [0, 360), s, v within [0, 1]
+//wxColor hsvColor(double h, double s, double v); //h within [0, 360), s, v within [0, 1]
@@ -208,7 +208,7 @@ wxColor gradient(const wxColor& from, const wxColor& to, double fraction)
/*
inline
-wxColour hsvColor(double h, double s, double v) //h within [0, 360), s, v within [0, 1]
+wxColor hsvColor(double h, double s, double v) //h within [0, 360), s, v within [0, 1]
{
//http://de.wikipedia.org/wiki/HSV-Farbraum
@@ -238,17 +238,17 @@ wxColour hsvColor(double h, double s, double v) //h within [0, 360), s, v within
switch (h_i)
{
case 0:
- return wxColour(vi, t, p);
+ return wxColor(vi, t, p);
case 1:
- return wxColour(q, vi, p);
+ return wxColor(q, vi, p);
case 2:
- return wxColour(p, vi, t);
+ return wxColor(p, vi, t);
case 3:
- return wxColour(p, q, vi);
+ return wxColor(p, q, vi);
case 4:
- return wxColour(t, p, vi);
+ return wxColor(t, p, vi);
case 5:
- return wxColour(vi, p, q);
+ return wxColor(vi, p, q);
}
assert(false);
return *wxBLACK;
bgstack15