diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-29 20:28:49 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-29 20:28:49 +0000 |
| commit | aa35831d1d0e4c798a63fe772430adc4f3a038cd (patch) | |
| tree | 1bff42e085bfcf17f906982d9924a81b5b5a79c3 /experimental/Intersection/Intersections.h | |
| parent | 81d3ce0b63bc87769fd543c2af79e7233d266d09 (diff) | |
shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@7453 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental/Intersection/Intersections.h')
| -rw-r--r-- | experimental/Intersection/Intersections.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/experimental/Intersection/Intersections.h b/experimental/Intersection/Intersections.h index 26e0d9bbc0..779ff33b3f 100644 --- a/experimental/Intersection/Intersections.h +++ b/experimental/Intersection/Intersections.h @@ -7,9 +7,6 @@ #ifndef Intersections_DEFINE #define Intersections_DEFINE -#include <algorithm> // for std::min -- Skia doesn't have a SkMinDouble -#include "SkTypes.h" - class Intersections { public: Intersections() @@ -29,7 +26,7 @@ public: return; } } - assert(fUsed < 9); + SkASSERT(fUsed < 9); fT[fSwap][fUsed] = one; fT[fSwap ^ 1][fUsed] = two; ++fUsed; @@ -43,7 +40,7 @@ public: return; } } - assert(fCoincidentUsed < 9); + SkASSERT(fCoincidentUsed < 9); fCoincidentT[fSwap][fCoincidentUsed] = one; fCoincidentT[fSwap ^ 1][fCoincidentUsed] = two; ++fCoincidentUsed; |