use Sk4f for matrix math

include/core/SkMatrix.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkMatrix_DEFINED
@@ skipping 395 matching lines @@
     /** Apply this matrix to the array of points specified by src, and write
         the transformed points into the array of points specified by dst.
         dst[] = M * src[]
         @param dst  Where the transformed coordinates are written. It must
                     contain at least count entries
         @param src  The original coordinates that are to be transformed. It
                     must contain at least count entries
         @param count The number of points in src to read, and then transform
                      into dst.
     */
-    void mapPoints(SkPoint dst[], const SkPoint src[], int count) const;
+    void mapPoints(SkPoint dst[], const SkPoint src[], int count) const {
+        SkASSERT((dst && src && count > 0) || 0 == count);
+        // no partial overlap
+        SkASSERT(src == dst || &dst[count] <= &src[0] || &src[count] <= &dst[0]);
+        this->getMapPtsProc()(*this, dst, src, count);
+    }
 
     /** Apply this matrix to the array of points, overwriting it with the
         transformed values.
         dst[] = M * pts[]
         @param pts  The points to be transformed. It must contain at least
                     count entries
         @param count The number of points in pts.
     */
     void mapPoints(SkPoint pts[], int count) const {
         this->mapPoints(pts, pts, count);
     }
 
-    void mapPts(SkPoint dst[], const SkPoint src[], int count) const {
-        gMapVPtsProcs[this->getType() & 0xF](*this, dst, src, count);
-    }
-
     /** Like mapPoints but with custom byte stride between the points. Stride
      *  should be a multiple of sizeof(SkScalar).
      */
     void mapPointsWithStride(SkPoint pts[], size_t stride, int count) const {
         SkASSERT(stride >= sizeof(SkPoint));
         SkASSERT(0 == stride % sizeof(SkScalar));
         for (int i = 0; i < count; ++i) {
             this->mapPoints(pts, pts, 1);
             pts = (SkPoint*)((intptr_t)pts + stride);
         }
@@ skipping 351 matching lines @@
     static void Identity_pts(const SkMatrix&, SkPoint[], const SkPoint[], int);
     static void Trans_pts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
     static void Scale_pts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
     static void ScaleTrans_pts(const SkMatrix&, SkPoint dst[], const SkPoint[],
                                int count);
     static void Rot_pts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
     static void RotTrans_pts(const SkMatrix&, SkPoint dst[], const SkPoint[],
                              int count);
     static void Persp_pts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
 
-    static void Trans_vpts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
-    static void Scale_vpts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
     static void Affine_vpts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
 
     static const MapPtsProc gMapPtsProcs[];
-    static const MapPtsProc gMapVPtsProcs[];
 
     friend class SkPerspIter;
 };
 
 #endif