| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkScalar_DEFINED | 8 #ifndef SkScalar_DEFINED |
| 9 #define SkScalar_DEFINED | 9 #define SkScalar_DEFINED |
| 10 | 10 |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 return (int)floor(xx); | 168 return (int)floor(xx); |
| 169 } | 169 } |
| 170 | 170 |
| 171 static inline SkScalar SkScalarClampMax(SkScalar x, SkScalar max) { | 171 static inline SkScalar SkScalarClampMax(SkScalar x, SkScalar max) { |
| 172 x = SkTMin(x, max); | 172 x = SkTMin(x, max); |
| 173 x = SkTMax<SkScalar>(x, 0); | 173 x = SkTMax<SkScalar>(x, 0); |
| 174 return x; | 174 return x; |
| 175 } | 175 } |
| 176 | 176 |
| 177 static inline SkScalar SkScalarPin(SkScalar x, SkScalar min, SkScalar max) { | 177 static inline SkScalar SkScalarPin(SkScalar x, SkScalar min, SkScalar max) { |
| 178 x = SkTMin(x, max); | 178 return SkTPin(x, min, max); |
| 179 x = SkTMax(x, min); | |
| 180 return x; | |
| 181 } | 179 } |
| 182 | 180 |
| 183 SkScalar SkScalarSinCos(SkScalar radians, SkScalar* cosValue); | 181 SkScalar SkScalarSinCos(SkScalar radians, SkScalar* cosValue); |
| 184 | 182 |
| 185 static inline SkScalar SkScalarSquare(SkScalar x) { return x * x; } | 183 static inline SkScalar SkScalarSquare(SkScalar x) { return x * x; } |
| 186 | 184 |
| 187 #define SkScalarMul(a, b) ((SkScalar)(a) * (b)) | 185 #define SkScalarMul(a, b) ((SkScalar)(a) * (b)) |
| 188 #define SkScalarMulAdd(a, b, c) ((SkScalar)(a) * (b) + (c)) | 186 #define SkScalarMulAdd(a, b, c) ((SkScalar)(a) * (b) + (c)) |
| 189 #define SkScalarDiv(a, b) ((SkScalar)(a) / (b)) | 187 #define SkScalarDiv(a, b) ((SkScalar)(a) / (b)) |
| 190 #define SkScalarMulDiv(a, b, c) ((SkScalar)(a) * (b) / (c)) | 188 #define SkScalarMulDiv(a, b, c) ((SkScalar)(a) * (b) / (c)) |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 SkASSERT(n >= 0); | 261 SkASSERT(n >= 0); |
| 264 for (int i = 0; i < n; ++i) { | 262 for (int i = 0; i < n; ++i) { |
| 265 if (a[i] != b[i]) { | 263 if (a[i] != b[i]) { |
| 266 return false; | 264 return false; |
| 267 } | 265 } |
| 268 } | 266 } |
| 269 return true; | 267 return true; |
| 270 } | 268 } |
| 271 | 269 |
| 272 #endif | 270 #endif |
| OLD | NEW |