diff options
author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-27 13:41:02 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-27 13:41:02 +0000 |
commit | 1a5e51f94ed8cb01600184119e52bb64bdb3dccc (patch) | |
tree | bae5a6b6820a519e349a943625e063ea949d7bff /include/effects/SkLightingImageFilter.h | |
parent | e8989578cd05d4bf6ebe35f0d49afbc3d3bef2ed (diff) |
remove SkScalarMul from public headers
BUG=skia:
Review URL: https://codereview.chromium.org/132453008
git-svn-id: http://skia.googlecode.com/svn/trunk@13189 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects/SkLightingImageFilter.h')
-rw-r--r-- | include/effects/SkLightingImageFilter.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/include/effects/SkLightingImageFilter.h b/include/effects/SkLightingImageFilter.h index 529ae9d620..b3fb7d0a0e 100644 --- a/include/effects/SkLightingImageFilter.h +++ b/include/effects/SkLightingImageFilter.h @@ -5,7 +5,6 @@ * found in the LICENSE file. */ - #ifndef SkLightingImageFilter_DEFINED #define SkLightingImageFilter_DEFINED @@ -18,9 +17,7 @@ public: SkPoint3(SkScalar x, SkScalar y, SkScalar z) : fX(x), fY(y), fZ(z) {} SkScalar dot(const SkPoint3& other) const { - return SkScalarMul(fX, other.fX) - + SkScalarMul(fY, other.fY) - + SkScalarMul(fZ, other.fZ); + return fX * other.fX + fY * other.fY + fZ * other.fZ; } SkScalar maxComponent() const { return fX > fY ? (fX > fZ ? fX : fZ) : (fY > fZ ? fY : fZ); @@ -28,14 +25,12 @@ public: void normalize() { // Small epsilon is added to prevent division by 0. SkScalar scale = SkScalarInvert(SkScalarSqrt(dot(*this)) + SK_ScalarNearlyZero); - fX = SkScalarMul(fX, scale); - fY = SkScalarMul(fY, scale); - fZ = SkScalarMul(fZ, scale); + fX = fX * scale; + fY = fY * scale; + fZ = fZ * scale; } SkPoint3 operator*(SkScalar scalar) const { - return SkPoint3(SkScalarMul(fX, scalar), - SkScalarMul(fY, scalar), - SkScalarMul(fZ, scalar)); + return SkPoint3(fX * scalar, fY * scalar, fZ * scalar); } SkPoint3 operator-(const SkPoint3& other) const { return SkPoint3(fX - other.fX, fY - other.fY, fZ - other.fZ); |