commit 5b5aed710fc4db986cc8b0f8ae3acda69eabd760
author aelias@chromium.org <aelias@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 04 22:26:28 2013 +0000
committer aelias@chromium.org <aelias@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 04 22:26:28 2013 +0000
tree 75e781eab7937797cbe74ff2f15592c691b3df56
parent 1fc162bc82420d91aefae2550fb6b26cc95cfef0

Revert "Add perspective support to SkMatrix44 initializers."

This reverts commit 93db1bcae0863feed8d00a61ae2cf72a90a0083c.

git-svn-id: http://skia.googlecode.com/svn/trunk/src@11623 2bbb7eff-a529-9590-31e7-b0007b416f81

utils/SkMatrix44.cpp

diff --git a/utils/SkMatrix44.cpp b/utils/SkMatrix44.cpp
index 9803b52..1e48f39 100644
--- a/utils/SkMatrix44.cpp
+++ b/utils/SkMatrix44.cpp
@@ -902,6 +902,8 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+// TODO: make this support src' perspective elements
+//
 static void initFromMatrix(SkMScalar dst[4][4], const SkMatrix& src) {
     dst[0][0] = SkScalarToMScalar(src[SkMatrix::kMScaleX]);
     dst[1][0] = SkScalarToMScalar(src[SkMatrix::kMSkewX]);
@@ -915,10 +917,10 @@
     dst[1][2] = 0;
     dst[2][2] = 1;
     dst[3][2] = 0;
-    dst[0][3] = SkScalarToMScalar(src[SkMatrix::kMPersp0]);
-    dst[1][3] = SkScalarToMScalar(src[SkMatrix::kMPersp1]);
+    dst[0][3] = 0;
+    dst[1][3] = 0;
     dst[2][3] = 0;
-    dst[3][3] = SkScalarToMScalar(src[SkMatrix::kMPersp2]);
+    dst[3][3] = 1;
 }
 
 SkMatrix44::SkMatrix44(const SkMatrix& src) {
@@ -936,8 +938,11 @@
     return *this;
 }
 
+// TODO: make this support our perspective elements
+//
 SkMatrix44::operator SkMatrix() const {
     SkMatrix dst;
+    dst.reset();    // setup our perspective correctly for identity
 
     dst[SkMatrix::kMScaleX]  = SkMScalarToScalar(fMat[0][0]);
     dst[SkMatrix::kMSkewX]  = SkMScalarToScalar(fMat[1][0]);
@@ -947,9 +952,5 @@
     dst[SkMatrix::kMScaleY] = SkMScalarToScalar(fMat[1][1]);
     dst[SkMatrix::kMTransY] = SkMScalarToScalar(fMat[3][1]);
 
-    dst[SkMatrix::kMPersp0] = SkMScalarToScalar(fMat[0][3]);
-    dst[SkMatrix::kMPersp1] = SkMScalarToScalar(fMat[1][3]);
-    dst[SkMatrix::kMPersp2] = SkMScalarToScalar(fMat[3][3]);
-
     return dst;
 }