Fix for displacement mapping

include/core/SkScalar.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkScalar_DEFINED
@@ skipping 114 matching lines @@
     */
     #define SkScalarFraction(x)     sk_float_mod(x, 1.0f)
 
     #define SkScalarFloorToScalar(x)    sk_float_floor(x)
     #define SkScalarCeilToScalar(x)     sk_float_ceil(x)
     #define SkScalarRoundToScalar(x)    sk_float_floor((x) + 0.5f)
 
     #define SkScalarFloorToInt(x)       sk_float_floor2int(x)
     #define SkScalarCeilToInt(x)        sk_float_ceil2int(x)
     #define SkScalarRoundToInt(x)       sk_float_round2int(x)
+    #define SkScalarTruncToInt(x)       static_cast<int>(x)
 
     /** Returns the absolute value of the specified SkScalar
     */
     #define SkScalarAbs(x)          sk_float_abs(x)
     /** Return x with the sign of y
      */
     #define SkScalarCopySign(x, y)  sk_float_copysign(x, y)
     /** Returns the value pinned between 0 and max inclusive
     */
     inline SkScalar SkScalarClampMax(SkScalar x, SkScalar max) {
@@ skipping 96 matching lines @@
     #define SkDoubleToScalar(n) SkDoubleToFixed(n)
     #define SkScalarFraction(x)     SkFixedFraction(x)
 
     #define SkScalarFloorToScalar(x)    SkFixedFloorToFixed(x)
     #define SkScalarCeilToScalar(x)     SkFixedCeilToFixed(x)
     #define SkScalarRoundToScalar(x)    SkFixedRoundToFixed(x)
 
     #define SkScalarFloorToInt(x)       SkFixedFloorToInt(x)
     #define SkScalarCeilToInt(x)        SkFixedCeilToInt(x)
     #define SkScalarRoundToInt(x)       SkFixedRoundToInt(x)
+    #define SkScalarTruncToInt(x)       (((x) < 0) ? SkScalarCeilToInt(x) : SkScalarFloorToInt(x))
 
     #define SkScalarAbs(x)          SkFixedAbs(x)
     #define SkScalarCopySign(x, y)  SkCopySign32(x, y)
     #define SkScalarClampMax(x, max) SkClampMax(x, max)
     #define SkScalarPin(x, min, max) SkPin32(x, min, max)
     #define SkScalarSquare(x)       SkFixedSquare(x)
     #define SkScalarMul(a, b)       SkFixedMul(a, b)
     #define SkScalarMulAdd(a, b, c) SkFixedMulAdd(a, b, c)
     #define SkScalarMulRound(a, b)  SkFixedMulCommon(a, b, SK_FixedHalf)
     #define SkScalarMulCeil(a, b)   SkFixedMulCommon(a, b, SK_Fixed1 - 1)
@@ skipping 107 matching lines @@
             return false;
         }
     }
     return true;
 #else
     return 0 == memcmp(a, b, n * sizeof(SkScalar));
 #endif
 }
 
 #endif