SkNx Load/store: take any pointer.

src/effects/SkColorMatrixFilter.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorMatrixFilter.h"
 #include "SkColorMatrix.h"
 #include "SkColorPriv.h"
@@ skipping 68 matching lines @@
 static Sk4f unpremul(const Sk4f& x) {
     return x * scale_rgb(1 / x.kth<SK_A32_SHIFT/8>());  // TODO: fast/approx invert?
 }
 
 static Sk4f clamp_0_1(const Sk4f& x) {
     return Sk4f::Max(Sk4f::Min(x, Sk4f(1)), Sk4f(0));
 }
 
 static SkPMColor round(const Sk4f& x) {
     SkPMColor c;
-    SkNx_cast<uint8_t>(x * Sk4f(255) + Sk4f(0.5f)).store((uint8_t*)&c);
+    SkNx_cast<uint8_t>(x * Sk4f(255) + Sk4f(0.5f)).store(&c);
     return c;
 }
 
 template <typename Adaptor, typename T>
 void filter_span(const float array[], const T src[], int count, T dst[]) {
     // c0-c3 are already in [0,1].
     const Sk4f c0 = Sk4f::Load(array + 0);
     const Sk4f c1 = Sk4f::Load(array + 4);
     const Sk4f c2 = Sk4f::Load(array + 8);
     const Sk4f c3 = Sk4f::Load(array + 12);
@@ skipping 25 matching lines @@
 
         dst[i] = Adaptor::From4f(premul(clamp_0_1(dst4)));
     }
 }
 
 struct SkPMColorAdaptor {
     static SkPMColor From4f(const Sk4f& c4) {
         return round(c4);
     }
     static Sk4f To4f(SkPMColor c) {
-        return SkNx_cast<float>(Sk4b::Load((const uint8_t*)&c)) * Sk4f(1.0f/255);
+        return SkNx_cast<float>(Sk4b::Load(&c)) * Sk4f(1.0f/255);
     }
 };
 void SkColorMatrixFilter::filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const {
     filter_span<SkPMColorAdaptor>(fTranspose, src, count, dst);
 }
 
 struct SkPM4fAdaptor {
     static SkPM4f From4f(const Sk4f& c4) {
         SkPM4f c;
-        c4.store(c.fVec);
+        c4.store(&c);
         return c;
     }
     static Sk4f To4f(const SkPM4f& c) {
-        return Sk4f::Load(c.fVec);
+        return Sk4f::Load(&c);
     }
 };
 void SkColorMatrixFilter::filterSpan4f(const SkPM4f src[], int count, SkPM4f dst[]) const {
     filter_span<SkPM4fAdaptor>(fTranspose, src, count, dst);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkColorMatrixFilter::flatten(SkWriteBuffer& buffer) const {
     SkASSERT(sizeof(fMatrix.fMat)/sizeof(SkScalar) == 20);
@@ skipping 221 matching lines @@
     matrix.setScale(byte_to_scale(SkColorGetR(mul)),
                     byte_to_scale(SkColorGetG(mul)),
                     byte_to_scale(SkColorGetB(mul)),
                     1);
     matrix.postTranslate(SkIntToScalar(SkColorGetR(add)),
                          SkIntToScalar(SkColorGetG(add)),
                          SkIntToScalar(SkColorGetB(add)),
                          0);
     return SkColorMatrixFilter::Create(matrix);
 }