summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2014-04-04 15:30:06 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2014-04-04 15:31:55 +0200
commit3aee2631795df394df7f69b6e30fa74fbd837618 (patch)
treea0afcbac04f4e8e3df3be7c4b4281678bfeacb1d /src
parentf90de3de9839f31ca6c7cb5479b6fd73506ad5dc (diff)
YIQ255 - second service - deuce
Change-Id: I7cc39c45a3d4a826a20d4e57dc703bec7bd0818e (cherry picked from commit 534d406ff9f6b124fddb3e18b44176aaba54f032)
Diffstat (limited to 'src')
-rw-r--r--src/lib/CDRCollector.cpp33
1 files changed, 19 insertions, 14 deletions
diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp
index 3bf86f7..0140a4f 100644
--- a/src/lib/CDRCollector.cpp
+++ b/src/lib/CDRCollector.cpp
@@ -497,30 +497,35 @@ unsigned libcdr::CDRParserState::_getRGBColor(const CDRColor &color)
blue = col0;
break;
}
- // YIQ
- case 0x0a:
// YIQ255
case 0x0b:
{
double y = (double)col0;
double i = (double)col1;
double q = (double)col2;
- if (colorModel == 0x0a)
- {
+
+ y -= 100.0;
+ if (y < 0.0)
y /= 100.0;
+ else
+ y /= 155.0;
+ y *= 0.5;
+ y += 0.5;
+
+ i -= 100.0;
+ if (i <= 0.0)
i /= 100.0;
+ else
+ i /= 155;
+ i *= 0.5957;
+
+ q -= 100.0;
+ if (q <= 0)
q /= 100.0;
- }
else
- {
- y /= 255.0;
- i /= 255.0;
- q /= 255.0;
- }
- i /= 2.0*0.5957;
- i -= 0.5957;
- q /= 2.0*0.5226;
- q -= 0.5226;
+ q /= 155;
+ q *= 0.5226;
+
double RR = y + 0.9563*i + 0.6210*q;
double GG = y - 0.2127*i - 0.6474*q;
double BB = y - 1.1070*i + 1.7046*q;