A bunch of little SkMScalar-as-float build fixes.

tests/Matrix44Test.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 "SkMatrix44.h"
 #include "Test.h"
 
@@ skipping 182 matching lines @@
 static const Make44Proc gMakeProcs[] = {
     make_i, make_t, make_s, make_st, make_a, make_p
 };
 
 static void test_map2(skiatest::Reporter* reporter, const SkMatrix44& mat) {
     SkMScalar src2[] = { 1, 2 };
     SkMScalar src4[] = { src2[0], src2[1], 0, 1 };
     SkMScalar dstA[4], dstB[4];
 
     for (int i = 0; i < 4; ++i) {
-        dstA[i] = 123456789;
-        dstB[i] = 987654321;
+        dstA[i] = SkDoubleToMScalar(123456789);
+        dstB[i] = SkDoubleToMScalar(987654321);
     }
 
     mat.map2(src2, 1, dstA);
     mat.mapMScalars(src4, dstB);
 
     for (int i = 0; i < 4; ++i) {
         REPORTER_ASSERT(reporter, dstA[i] == dstB[i]);
     }
 }
 
@@ skipping 310 matching lines @@
     REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[3], vec3transformed[2]));
     REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[0], vec4transformed2[0]));
     REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[1], vec4transformed2[1]));
     REPORTER_ASSERT(reporter, !nearly_equal_scalar(vec4transformed[2], vec4transformed2[2]));
     REPORTER_ASSERT(reporter, nearly_equal_scalar(vec4transformed[3], vec4transformed2[3]));
 }
 
 static void test_has_perspective(skiatest::Reporter* reporter) {
     SkMatrix44 transform(SkMatrix44::kIdentity_Constructor);
 
-    transform.set(3, 2, -0.1);
+    transform.setDouble(3, 2, -0.1);
     REPORTER_ASSERT(reporter, transform.hasPerspective());
 
     transform.reset();
     REPORTER_ASSERT(reporter, !transform.hasPerspective());
 
-    transform.set(3, 0, -1.0);
+    transform.setDouble(3, 0, -1.0);
     REPORTER_ASSERT(reporter, transform.hasPerspective());
 
     transform.reset();
-    transform.set(3, 1, -1.0);
+    transform.setDouble(3, 1, -1.0);
     REPORTER_ASSERT(reporter, transform.hasPerspective());
 
     transform.reset();
-    transform.set(3, 2, -0.3);
+    transform.setDouble(3, 2, -0.3);
     REPORTER_ASSERT(reporter, transform.hasPerspective());
 
     transform.reset();
-    transform.set(3, 3, 0.5);
+    transform.setDouble(3, 3, 0.5);
     REPORTER_ASSERT(reporter, transform.hasPerspective());
- 
+
     transform.reset();
-    transform.set(3, 3, 0.0);
+    transform.setDouble(3, 3, 0.0);
     REPORTER_ASSERT(reporter, transform.hasPerspective());
 }
 
 static bool is_rectilinear (SkVector4& p1, SkVector4& p2, SkVector4& p3, SkVector4& p4) {
     return (SkScalarNearlyEqual(p1.fData[0], p2.fData[0]) &&
             SkScalarNearlyEqual(p2.fData[1], p3.fData[1]) &&
             SkScalarNearlyEqual(p3.fData[0], p4.fData[0]) &&
             SkScalarNearlyEqual(p4.fData[1], p1.fData[1])) ||
            (SkScalarNearlyEqual(p1.fData[1], p2.fData[1]) &&
             SkScalarNearlyEqual(p2.fData[0], p3.fData[0]) &&
@@ skipping 182 matching lines @@
   for (size_t i = 0; i < sizeof(double_rotation_tests)/sizeof(DoubleRotationCase); ++i) {
     const DoubleRotationCase& value = double_rotation_tests[i];
     transform.setRotateDegreesAbout(value.x1, value.y1, value.z1, value.degrees1);
     transform2.setRotateDegreesAbout(value.x2, value.y2, value.z2, value.degrees2);
     transform.postConcat(transform2);
     test(value.expected, reporter, transform);
   }
 
   // Perspective cases.
   transform.setIdentity();
-  transform.set(3, 2, -0.1); // Perspective depth 10
+  transform.setDouble(3, 2, -0.1); // Perspective depth 10
   transform2.setRotateDegreesAbout(0.0, 1.0, 0.0, 45.0);
   transform.preConcat(transform2);
   test(false, reporter, transform);
 
   transform.setIdentity();
-  transform.set(3, 2, -0.1); // Perspective depth 10
+  transform.setDouble(3, 2, -0.1); // Perspective depth 10
   transform2.setRotateDegreesAbout(0.0, 0.0, 1.0, 90.0);
   transform.preConcat(transform2);
   test(true, reporter, transform);
 }
 
 // just want to exercise the various converters for MScalar
 static void test_toint(skiatest::Reporter* reporter) {
     SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor);
     mat.setScale(3, 3, 3);
 
@@ skipping 35 matching lines @@
     mat.postConcat(rot);
     REPORTER_ASSERT(reporter, mat.invert(NULL));
     mat.invert(&inverse);
     iden1.setConcat(mat, inverse);
     REPORTER_ASSERT(reporter, is_identity(iden1));
     iden2.setConcat(inverse, mat);
     REPORTER_ASSERT(reporter, is_identity(iden2));
 
     // test tiny-valued matrix inverse
     mat.reset();
-    mat.setScale(1.0e-12, 1.0e-12, 1.0e-12);
+    auto v = SkDoubleToMScalar(1.0e-12);
+    mat.setScale(v,v,v);
     rot.setRotateDegreesAbout(0, 0, -1, 90);
     mat.postConcat(rot);
-    mat.postTranslate(1.0e-12, 1.0e-12, 1.0e-12);
+    mat.postTranslate(v,v,v);
     REPORTER_ASSERT(reporter, mat.invert(NULL));
     mat.invert(&inverse);
     iden1.setConcat(mat, inverse);
     REPORTER_ASSERT(reporter, is_identity(iden1));
 
     // test mixed-valued matrix inverse
     mat.reset();
-    mat.setScale(1.0e-10, 3.0, 1.0e+10);
+    mat.setScale(SkDoubleToMScalar(1.0e-10),
+                 SkDoubleToMScalar(3.0),
+                 SkDoubleToMScalar(1.0e+10));
     rot.setRotateDegreesAbout(0, 0, -1, 90);
     mat.postConcat(rot);
-    mat.postTranslate(1.0e+10, 3.0, 1.0e-10);
+    mat.postTranslate(SkDoubleToMScalar(1.0e+10),
+                      SkDoubleToMScalar(3.0),
+                      SkDoubleToMScalar(1.0e-10));
     REPORTER_ASSERT(reporter, mat.invert(NULL));
     mat.invert(&inverse);
     iden1.setConcat(mat, inverse);
     REPORTER_ASSERT(reporter, is_identity(iden1));
 
     // test degenerate matrix
     mat.reset();
     mat.set3x3(1.0, 1.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0);
     REPORTER_ASSERT(reporter, !mat.invert(NULL));
 
@@ skipping 40 matching lines @@
     test_get_set_double(reporter);
     test_set_row_col_major(reporter);
     test_translate(reporter);
     test_scale(reporter);
     test_map2(reporter);
     test_3x3_conversion(reporter);
     test_has_perspective(reporter);
     test_preserves_2d_axis_alignment(reporter);
     test_toint(reporter);
 }