diff options
| author |  skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-20 02:01:23 +0000 |
|---|---|---|
| committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-20 02:01:23 +0000 |
| commit | 24c29d91caa4eaa31f9e77bad614627a252df35e (patch) | |
| tree | 2841452beab111db218c31b08fdf3e8a31bcb2b4 | |
| parent | c6126c182882512fce0b40be5f02a521b7e3ee8e (diff) | |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6023 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | experimental/Intersection/Simplify.cpp | 8 | ||||
| -rw-r--r-- | gm/modecolorfilters.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp index 1ea5b19de7..513f2e22a1 100644 --- a/experimental/Intersection/Simplify.cpp +++ b/experimental/Intersection/Simplify.cpp @@ -829,7 +829,7 @@ public: fID = ++gSegmentID; #endif } - + bool operator<(const Segment& rh) const { return fBounds.fTop < rh.fBounds.fTop; } @@ -1675,7 +1675,7 @@ public: const Span& mSpan = fTs[SkMin32(start, end)]; return mSpan.fDone; } - + Segment* findNextOp(SkTDArray<Span*>& chase, bool active, int& nextStart, int& nextEnd, int& winding, int& spanWinding, bool& unsortable, ShapeOp op, @@ -2619,7 +2619,7 @@ public: span.fWindSum = winding; return &span; } - + void markUnsortable(int start, int end) { Span* span = &fTs[start]; if (start < end) { @@ -3067,7 +3067,7 @@ public: windSum -= segment.spanSign(&angle); } SkDebugf("%s [%d] %sid=%d %s start=%d (%1.9g,%,1.9g) end=%d (%1.9g,%,1.9g)" - " sign=%d windValue=%d windSum=", + " sign=%d windValue=%d windSum=", __FUNCTION__, index, angle.unsortable() ? "*** UNSORTABLE *** " : "", segment.fID, kLVerbStr[segment.fVerb], start, segment.xAtT(&sSpan), segment.yAtT(&sSpan), end, diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp index 40e65fca05..35150338ae 100644 --- a/gm/modecolorfilters.cpp +++ b/gm/modecolorfilters.cpp @@ -72,7 +72,7 @@ protected: virtual void onDraw(SkCanvas* canvas) { // size of rect for each test case static const int kRectWidth = 20; - static const int kRectHeight = 20; + static const int kRectHeight = 20; static const int kCheckSize = 10; @@ -101,7 +101,7 @@ protected: // used with shaders SkColor alphas[] = {0xFFFFFFFF, 0x80808080}; - + SkXfermode::Mode modes[] = { // currently just doing the Modes expressible as Coeffs SkXfermode::kClear_Mode, SkXfermode::kSrc_Mode, |