[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: www/areas/accessibility
From: Olaf Schmidt <ojschmidt () kde ! org>
Date: 2006-07-24 17:34:54
Message-ID: 1153762494.993947.26871.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 565876 by ojschmidt:
Repair hue function
M +18 -16 oxygen.php
--- trunk/www/areas/accessibility/oxygen.php #565875:565876
@@ -88,33 +88,35 @@
$min = min ($color ["redL"], $color ["greenL"], $color ["blueL"]);
$med = $color ["redL"] + $color ["greenL"] + $color ["blueL"] - $max - $min;
- $hue = ($med - $min) / ($max - $min);
-
if ($max == $min) {
$color ["hue"] = "-";
$color ["saturation"] = 0;
}
else {
+ $hue = ($med - $min) / ($max - $min);
+ if ($med == $color ["redL"]) {
+ $factor = 0.2126 * $hue;
+ $hue = -$hue;
+ } elseif ($med == $color ["greenL"]) {
+ $factor = 0.7152 * $hue;
+ } else {
+ $factor = 0.0722 * $hue;
+ }
+
if ($max == $color ["redL"]) {
- $factor = 0.2126;
+ if ($hue < 0) $hue += 6;
+ $factor += 0.2126;
} elseif ($max == $color ["greenL"]) {
- $color ["hue"] += $hue + 1/3;
- $factor = 0.7152;
+ $hue += 2;
+ $factor += 0.7152;
} else {
- $color ["hue"] += 2/3;
- $factor = 0.0722;
+ $hue += 4;
+ $factor += 0.0722;
}
- if ($med == $color ["redL"]) {
- $factor += 0.2126 * $hue;
- } elseif ($med == $color ["greenL"]) {
- $factor += 0.7152 * $hue;
- } else {
- $factor += 0.0722 * $hue;
- }
+ $color ["hue"] = $hue/6;
+ $color ["saturation"] = max (($max-$min)*$factor/$color ["luminosity"], \
($max-$min)*($factor-1)/($color ["luminosity"]-1)); }
-
- $color ["saturation"] = max (($max-$min)*$factor/$color ["luminosity"], \
($max-$min)*($factor-1)/($color ["luminosity"]-1)); }
function printTableLine (const $colors, const $color, const $name, const $tablename) \
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic