Patches on top of Radu's latest.

src/opts/SkColorCubeFilter_opts.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SkColorCubeFilter_opts_DEFINED
 #define SkColorCubeFilter_opts_DEFINED
 
 #include "SkColor.h"
 #include "SkPMFloat.h"
 #include "SkUnPreMultiply.h"
@@ skipping 52 matching lines @@
 
             Sk4f  sum = SkPMFloat::FromBGRx(lutColor00) * g0b0;
             sum = sum + SkPMFloat::FromBGRx(lutColor01) * g0b1;
             sum = sum + SkPMFloat::FromBGRx(lutColor10) * g1b0;
             sum = sum + SkPMFloat::FromBGRx(lutColor11) * g1b1;
 
             color = color + sum * Sk4f((float)colorToFactors[x][r]);
         }
 
         if (a != 255) {
-            color = color * Sk4f(((float)a) / 255);
+            color = color * Sk4f(a * 1.0f/255);
         }
 
         dst[i] = color.round();
 
         ptr_dst[SK_A32_SHIFT / 8] = a;
         ptr_dst += 4;
     }
 }
 
 }  // namespace SK_OPTS NS
 
 #endif  // SkColorCubeFilter_opts_DEFINED