remove dead SkPersp macros

src/animator/SkDrawMatrix.cpp

 
 /*
  * 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.
  */
 
 
 #include "SkDrawMatrix.h"
@@ skipping 101 matching lines @@
         SkDebugf("skew-x=\"%g\" ", SkScalarToFloat(result));
     result = fMatrix.getSkewY();
     if (result)
         SkDebugf("skew-y=\"%g\" ", SkScalarToFloat(result));
     result = fMatrix.getTranslateX();
     if (result)
         SkDebugf("tx=\"%g\" ", SkScalarToFloat(result));
     result = fMatrix.getTranslateY();
     if (result)
         SkDebugf("ty=\"%g\" ", SkScalarToFloat(result));
-    result = SkPerspToScalar(fMatrix.getPerspX());
+    result = fMatrix.getPerspX();
     if (result)
         SkDebugf("perspect-x=\"%g\" ", SkScalarToFloat(result));
-    result = SkPerspToScalar(fMatrix.getPerspY());
+    result = fMatrix.getPerspY();
     if (result)
         SkDebugf("perspect-y=\"%g\" ", SkScalarToFloat(result));
     SkDebugf("/>\n");
 }
 #endif
 
 SkMatrix& SkDrawMatrix::getMatrix() {
     if (fDirty == false)
         return fConcat;
     fMatrix.reset();
@@ skipping 47 matching lines @@
 
 void SkDrawMatrix::onEndElement(SkAnimateMaker& ) {
     if (matrix.count() > 0) {
         SkScalar* vals = matrix.begin();
         fMatrix.setScaleX(vals[0]);
         fMatrix.setSkewX(vals[1]);
         fMatrix.setTranslateX(vals[2]);
         fMatrix.setSkewY(vals[3]);
         fMatrix.setScaleY(vals[4]);
         fMatrix.setTranslateY(vals[5]);
-        fMatrix.setPerspX(SkScalarToPersp(vals[6]));
-        fMatrix.setPerspY(SkScalarToPersp(vals[7]));
-//      fMatrix.setPerspW(SkScalarToPersp(vals[8]));
+        fMatrix.setPerspX(vals[6]);
+        fMatrix.setPerspY(vals[7]);
+//      fMatrix.setPerspW(vals[8]);
         goto setConcat;
     }
     if (fChildHasID == false) {
         {
             for (SkMatrixPart** part = fParts.begin(); part < fParts.end();  part++)
                 delete *part;
         }
         fParts.reset();
 setConcat:
         fConcat = fMatrix;
@@ skipping 11 matching lines @@
         case SK_PROPERTY(translate):
     //      SkScalar xy[2];
             SkASSERT(scriptValue.fType == SkType_Array);
             SkASSERT(scriptValue.fOperand.fArray->getType() == SkType_Float);
             SkASSERT(scriptValue.fOperand.fArray->count() == 2);
     //      SkParse::FindScalars(scriptValue.fOperand.fString->c_str(), xy, 2);
             fMatrix.setTranslateX((*scriptValue.fOperand.fArray)[0].fScalar);
             fMatrix.setTranslateY((*scriptValue.fOperand.fArray)[1].fScalar);
             return true;
         case SK_PROPERTY(perspectX):
-            fMatrix.setPerspX(SkScalarToPersp((number)));
+            fMatrix.setPerspX(number);
             break;
         case SK_PROPERTY(perspectY):
-            fMatrix.setPerspY(SkScalarToPersp((number)));
+            fMatrix.setPerspY(number);
             break;
         case SK_PROPERTY(rotate): {
             SkMatrix temp;
             temp.setRotate(number, 0, 0);
             fMatrix.setScaleX(temp.getScaleX());
             fMatrix.setScaleY(temp.getScaleY());
             fMatrix.setSkewX(temp.getSkewX());
             fMatrix.setSkewY(temp.getSkewY());
             } break;
         case SK_PROPERTY(scale):
@@ skipping 18 matching lines @@
         case SK_PROPERTY(translateY):
             fMatrix.setTranslateY(number);
             break;
         default:
             SkASSERT(0);
             return false;
     }
     fConcat = fMatrix;
     return true;
 }