diff options
| -rw-r--r-- | include/core/SkMatrix.h | 3 | ||||
| -rw-r--r-- | src/core/SkMatrix.cpp | 52 |
2 files changed, 0 insertions, 55 deletions
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h index 1c79d22121..89b3072f79 100644 --- a/include/core/SkMatrix.h +++ b/include/core/SkMatrix.h @@ -797,9 +797,6 @@ private: 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 Affine_vpts(const SkMatrix&, SkPoint dst[], const SkPoint[], int); diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp index 0ac026bc9f..9c9c4375f9 100644 --- a/src/core/SkMatrix.cpp +++ b/src/core/SkMatrix.cpp @@ -937,53 +937,6 @@ void SkMatrix::Scale_pts(const SkMatrix& m, SkPoint dst[], const SkPoint src[], } } -void SkMatrix::Rot_pts(const SkMatrix& m, SkPoint dst[], - const SkPoint src[], int count) { - SkASSERT((m.getType() & (kPerspective_Mask | kTranslate_Mask)) == 0); - - if (count > 0) { - SkScalar mx = m.fMat[kMScaleX]; - SkScalar my = m.fMat[kMScaleY]; - SkScalar kx = m.fMat[kMSkewX]; - SkScalar ky = m.fMat[kMSkewY]; - do { - SkScalar sy = src->fY; - SkScalar sx = src->fX; - src += 1; - dst->fY = sdot(sx, ky, sy, my); - dst->fX = sdot(sx, mx, sy, kx); - dst += 1; - } while (--count); - } -} - -void SkMatrix::RotTrans_pts(const SkMatrix& m, SkPoint dst[], - const SkPoint src[], int count) { - SkASSERT(!m.hasPerspective()); - - if (count > 0) { - SkScalar mx = m.fMat[kMScaleX]; - SkScalar my = m.fMat[kMScaleY]; - SkScalar kx = m.fMat[kMSkewX]; - SkScalar ky = m.fMat[kMSkewY]; - SkScalar tx = m.fMat[kMTransX]; - SkScalar ty = m.fMat[kMTransY]; - do { - SkScalar sy = src->fY; - SkScalar sx = src->fX; - src += 1; -#ifdef SK_LEGACY_MATRIX_MATH_ORDER - dst->fY = sx * ky + (sy * my + ty); - dst->fX = sx * mx + (sy * kx + tx); -#else - dst->fY = sdot(sx, ky, sy, my) + ty; - dst->fX = sdot(sx, mx, sy, kx) + tx; -#endif - dst += 1; - } while (--count); - } -} - void SkMatrix::Persp_pts(const SkMatrix& m, SkPoint dst[], const SkPoint src[], int count) { SkASSERT(m.hasPerspective()); @@ -1045,13 +998,8 @@ void SkMatrix::Affine_vpts(const SkMatrix& m, SkPoint dst[], const SkPoint src[] const SkMatrix::MapPtsProc SkMatrix::gMapPtsProcs[] = { SkMatrix::Identity_pts, SkMatrix::Trans_pts, SkMatrix::Scale_pts, SkMatrix::Scale_pts, -#ifdef SK_SUPPORT_LEGACY_SCALAR_MAPPOINTS - SkMatrix::Rot_pts, SkMatrix::RotTrans_pts, - SkMatrix::Rot_pts, SkMatrix::RotTrans_pts, -#else SkMatrix::Affine_vpts, SkMatrix::Affine_vpts, SkMatrix::Affine_vpts, SkMatrix::Affine_vpts, -#endif // repeat the persp proc 8 times SkMatrix::Persp_pts, SkMatrix::Persp_pts, SkMatrix::Persp_pts, SkMatrix::Persp_pts, |