New names for SkPMFloat methods.

src/effects/SkColorMatrixFilter.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 "SkColorMatrixFilter.h"
 #include "SkColorMatrix.h"
 #include "SkColorPriv.h"
@@ skipping 281 matching lines @@
 #endif
 
     if (use_floats) {
         const Sk4f c0 = Sk4f::Load(fTranspose + 0);
         const Sk4f c1 = Sk4f::Load(fTranspose + 4);
         const Sk4f c2 = Sk4f::Load(fTranspose + 8);
         const Sk4f c3 = Sk4f::Load(fTranspose + 12);
         const Sk4f c4 = Sk4f::Load(fTranspose + 16);  // translates
 
         // todo: we could cache this in the constructor...
-        SkPMColor matrix_translate_pmcolor = SkPMFloat(premul(clamp_0_255(c4))).clamped();
+        SkPMColor matrix_translate_pmcolor = SkPMFloat(premul(clamp_0_255(c4))).roundClamp();
 
         for (int i = 0; i < count; i++) {
             const SkPMColor src_c = src[i];
             if (0 == src_c) {
                 dst[i] = matrix_translate_pmcolor;
                 continue;
             }
 
             SkPMFloat srcf(src_c);
 
             if (0xFF != SkGetPackedA32(src_c)) {
                 srcf = unpremul(srcf);
             }
 
             Sk4f r4 = Sk4f(srcf.r());
             Sk4f g4 = Sk4f(srcf.g());
             Sk4f b4 = Sk4f(srcf.b());
             Sk4f a4 = Sk4f(srcf.a());
 
             // apply matrix
             Sk4f dst4 = c0 * r4 + c1 * g4 + c2 * b4 + c3 * a4 + c4;
 
             // clamp, re-premul, and write
-            dst[i] = SkPMFloat(premul(clamp_0_255(dst4))).get();
+            dst[i] = SkPMFloat(premul(clamp_0_255(dst4))).round();
         }
     } else {
         const State& state = fState;
         int32_t result[4];
         const SkUnPreMultiply::Scale* table = SkUnPreMultiply::GetScaleTable();
 
         for (int i = 0; i < count; i++) {
             SkPMColor c = src[i];
 
             unsigned r = SkGetPackedR32(c);
@@ skipping 240 matching lines @@
     str->append("matrix: (");
     for (int i = 0; i < 20; ++i) {
         str->appendScalar(fMatrix.fMat[i]);
         if (i < 19) {
             str->append(", ");
         }
     }
     str->append(")");
 }
 #endif