commit f9037dabea3ccf80b05ec1d66aeac13bee38b239
author Romain Guy <romainguy@google.com> Wed Oct 12 18:29:06 2016 -0700
committer Romain Guy <romainguy@google.com> Wed Oct 12 18:31:31 2016 -0700
tree 45880bdb6d48e1b83e7035b992dc3138c00da4e3
parent f60cc2004838f6f6a926294114e2aa5489cb8deb

Don't apply the OECF twice to multi-stop gradients

Test: Manual

Change-Id: Icd65d906df2f0a059373edb8c6d55fe378c92f92

libs/hwui/GradientCache.cpp

diff --git a/libs/hwui/GradientCache.cpp b/libs/hwui/GradientCache.cpp
index cd3ccf9..0972ac1 100644
--- a/libs/hwui/GradientCache.cpp
+++ b/libs/hwui/GradientCache.cpp
@@ -198,7 +198,7 @@
         float amount, uint8_t*& dst) const {
     float oppAmount = 1.0f - amount;
     float* d = (float*) dst;
-#if ANDROID_LINEAR_BLENDING_ENABLED
+#ifdef ANDROID_ENABLE_LINEAR_BLENDING
     *d++ = start.r * oppAmount + end.r * amount;
     *d++ = start.g * oppAmount + end.g * amount;
     *d++ = start.b * oppAmount + end.b * amount;