| Index: include/utils/SkCamera.h
|
| diff --git a/include/utils/SkCamera.h b/include/utils/SkCamera.h
|
| index eafacbcd7d4973ba639915b46bcbe1e11b3d1439..ad74c81d2f7b3f96ede79f0d21091effed355fe1 100644
|
| --- a/include/utils/SkCamera.h
|
| +++ b/include/utils/SkCamera.h
|
| @@ -19,17 +19,10 @@
|
|
|
| class SkCanvas;
|
|
|
| -#ifdef SK_SCALAR_IS_FIXED
|
| - typedef SkFract SkUnitScalar;
|
| - #define SK_UnitScalar1 SK_Fract1
|
| - #define SkUnitScalarMul(a, b) SkFractMul(a, b)
|
| - #define SkUnitScalarDiv(a, b) SkFractDiv(a, b)
|
| -#else
|
| - typedef float SkUnitScalar;
|
| - #define SK_UnitScalar1 SK_Scalar1
|
| - #define SkUnitScalarMul(a, b) SkScalarMul(a, b)
|
| - #define SkUnitScalarDiv(a, b) SkScalarDiv(a, b)
|
| -#endif
|
| +typedef float SkUnitScalar;
|
| +#define SK_UnitScalar1 SK_Scalar1
|
| +#define SkUnitScalarMul(a, b) SkScalarMul(a, b)
|
| +#define SkUnitScalarDiv(a, b) SkScalarDiv(a, b)
|
|
|
| struct SkUnit3D {
|
| SkUnitScalar fX, fY, fZ;
|
|
|