From cd554e36a85e39556149ce4609da6e5fe0a6a176 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Mon, 10 Mar 2014 12:42:08 -0700 Subject: [PATCH] Don't simulate color space after correction Change-Id: Ied0918ffa2be5f9382e693f442b142b3e068e735 --- services/surfaceflinger/Effects/Daltonizer.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/services/surfaceflinger/Effects/Daltonizer.cpp b/services/surfaceflinger/Effects/Daltonizer.cpp index f384ba453..feb8936cd 100644 --- a/services/surfaceflinger/Effects/Daltonizer.cpp +++ b/services/surfaceflinger/Effects/Daltonizer.cpp @@ -148,9 +148,6 @@ void Daltonizer::update() { // set to identity, errp, errd, errt ([0] for simulation only) mat4 correction(0); - // control: simulation post-correction (used for debugging): - // set to identity or lms2lmsp, lms2lmsd, lms2lmst - mat4 control; switch (mType) { case protanopia: case protanomaly: @@ -172,12 +169,8 @@ void Daltonizer::update() { break; } - if (true) { - control = simulation; - } - - mColorTransform = lms2rgb * control * - (simulation * rgb2lms + correction * (rgb2lms - simulation * rgb2lms)); + mColorTransform = lms2rgb * + (simulation * rgb2lms + correction * (rgb2lms - simulation * rgb2lms)); } } /* namespace android */