From 783cbb5f1aa667d3c12142b4ca39afc534f24d1d Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 8 Aug 2011 19:04:03 +0000
Subject: [PATCH] fix: brightness of color mixture is the maximum effective
brightness
SVN: 22414
---
common/source/java/ch/systemsx/cisd/common/color/MixColors.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/color/MixColors.java b/common/source/java/ch/systemsx/cisd/common/color/MixColors.java
index 343b609bbea..aaa80f83911 100644
--- a/common/source/java/ch/systemsx/cisd/common/color/MixColors.java
+++ b/common/source/java/ch/systemsx/cisd/common/color/MixColors.java
@@ -63,7 +63,7 @@ public class MixColors
for (int i = 0; i < weights.length; ++i)
{
hue += weights[i] * colors[i].getHue();
- brightness = Math.max(brightness, colors[i].getBrightness());
+ brightness = Math.max(brightness, intensities[i] * colors[i].getBrightness());
}
return new PureHSBColor(hue, brightness);
--
GitLab