| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #ifndef SkGeometry_DEFINED | 10 #ifndef SkGeometry_DEFINED |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 but if it is equal to cubic[3].fY then it is considered to | 184 but if it is equal to cubic[3].fY then it is considered to |
| 185 cross. | 185 cross. |
| 186 Optional outgoing "ambiguous" argument indicates whether the answer is | 186 Optional outgoing "ambiguous" argument indicates whether the answer is |
| 187 ambiguous because the query occurred exactly at one of the endpoints' y | 187 ambiguous because the query occurred exactly at one of the endpoints' y |
| 188 coordinates or at a tangent point, indicating that another query y | 188 coordinates or at a tangent point, indicating that another query y |
| 189 coordinate is preferred for robustness. | 189 coordinate is preferred for robustness. |
| 190 */ | 190 */ |
| 191 int SkNumXRayCrossingsForCubic(const SkXRay& pt, const SkPoint cubic[4], | 191 int SkNumXRayCrossingsForCubic(const SkXRay& pt, const SkPoint cubic[4], |
| 192 bool* ambiguous = NULL); | 192 bool* ambiguous = NULL); |
| 193 | 193 |
| 194 SkScalar approx_arc_length(SkPoint* points, int count); |
| 195 |
| 194 /////////////////////////////////////////////////////////////////////////////// | 196 /////////////////////////////////////////////////////////////////////////////// |
| 195 | 197 |
| 196 enum SkRotationDirection { | 198 enum SkRotationDirection { |
| 197 kCW_SkRotationDirection, | 199 kCW_SkRotationDirection, |
| 198 kCCW_SkRotationDirection | 200 kCCW_SkRotationDirection |
| 199 }; | 201 }; |
| 200 | 202 |
| 201 /** Maximum number of points needed in the quadPoints[] parameter for | 203 /** Maximum number of points needed in the quadPoints[] parameter for |
| 202 SkBuildQuadArc() | 204 SkBuildQuadArc() |
| 203 */ | 205 */ |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 private: | 309 private: |
| 308 enum { | 310 enum { |
| 309 kQuadCount = 8, // should handle most conics | 311 kQuadCount = 8, // should handle most conics |
| 310 kPointCount = 1 + 2 * kQuadCount, | 312 kPointCount = 1 + 2 * kQuadCount, |
| 311 }; | 313 }; |
| 312 SkAutoSTMalloc<kPointCount, SkPoint> fStorage; | 314 SkAutoSTMalloc<kPointCount, SkPoint> fStorage; |
| 313 int fQuadCount; // #quads for current usage | 315 int fQuadCount; // #quads for current usage |
| 314 }; | 316 }; |
| 315 | 317 |
| 316 #endif | 318 #endif |
| OLD | NEW |