Patches on top of Radu's latest.

src/effects/SkColorCubeFilter.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorCubeFilter.h"
 #include "SkColorPriv.h"
 #include "SkOnce.h"
@@ skipping 113 matching lines @@
 }
 
 void SkColorCubeFilter::filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const {
     const int* colorToIndex[2];
     const SkScalar* colorToFactors[2];
     const SkScalar* colorToScalar;
     fCache.getProcessingLuts(&colorToIndex, &colorToFactors, &colorToScalar);
 
     SkOpts::color_cube_filter_span(src, count, dst, colorToIndex,
                                    colorToFactors, fCache.cubeDimension(),
-                                   (SkColor*)fCubeData->data());
+                                   (const SkColor*)fCubeData->data());
 }
 
 SkFlattenable* SkColorCubeFilter::CreateProc(SkReadBuffer& buffer) {
     int cubeDimension = buffer.readInt();
     SkAutoDataUnref cubeData(buffer.readByteArrayAsData());
     if (!buffer.validate(is_valid_3D_lut(cubeData, cubeDimension))) {
         return NULL;
     }
     return Create(cubeData, cubeDimension);
 }
@@ skipping 188 matching lines @@
             *array->append() = frag;
         } else {
             frag->unref();
             SkDEBUGCODE(frag = NULL;)
         }
         return true;
     }
     return false;
 }
 #endif