Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6376 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/ShapeOps.cpp b/experimental/Intersection/ShapeOps.cpp
index dad482a..5356ca6 100644
--- a/experimental/Intersection/ShapeOps.cpp
+++ b/experimental/Intersection/ShapeOps.cpp
@@ -125,7 +125,7 @@
return NULL;
}
-static bool windingIsActive(int winding, int oppWinding, int spanWinding,
+static bool windingIsActive(int winding, int oppWinding, int spanWinding,
bool windingIsOp, ShapeOp op) {
bool active = windingIsActive(winding, spanWinding);
if (!active) {
@@ -165,7 +165,7 @@
} else {
contourWinding = sumWinding;
oppContourWinding = 0;
- SkASSERT(0);
+ SkASSERT(0);
// FIXME: need to get oppContourWinding by building sort wheel and
// retrieving sumWinding of uphill opposite span, calling inner contour check
// if need be
@@ -190,7 +190,7 @@
int spanWinding = current->spanSign(index, endIndex);
SkTDArray<Span*> chaseArray;
do {
- bool active = windingIsActive(winding, oppWinding, spanWinding,
+ bool active = windingIsActive(winding, oppWinding, spanWinding,
current->operand(), op);
#if DEBUG_WINDING
SkDebugf("%s active=%s winding=%d oppWinding=%d spanWinding=%d\n",
diff --git a/experimental/Intersection/ShapeOps.h b/experimental/Intersection/ShapeOps.h
index f12a23b..d6959b9 100644
--- a/experimental/Intersection/ShapeOps.h
+++ b/experimental/Intersection/ShapeOps.h
@@ -19,7 +19,7 @@
kIntersect_Op,
kUnion_Op,
kXor_Op,
- kShapeOp_Count
+ kShapeOp_Count
};
enum ShapeOpMask {
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index 02be64c..4261029 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -3084,7 +3084,7 @@
SkPath::Verb verb() const {
return fVerb;
}
-
+
int windSum(int tIndex) const {
return fTs[tIndex].fWindSum;
}
@@ -3106,7 +3106,7 @@
int index = SkMin32(start, end);
return windValue(index);
}
-
+
SkScalar xAtT(const Span* span) const {
return xyAtT(span).fX;
}
@@ -3364,7 +3364,7 @@
last = lastSum;
wind = windSum;
}
- SkDebugf(" winding: %d->%d (max=%d) ", last, wind,
+ SkDebugf(" winding: %d->%d (max=%d) ", last, wind,
useInnerWinding(last, wind) ? wind : last);
SkDebugf(" done=%d tiny=%d opp=%d\n", mSpan.fDone, mSpan.fTiny, opp);
#if false && DEBUG_ANGLE
@@ -3572,7 +3572,7 @@
fSegments[sIndex].fixOtherTIndex();
}
}
-
+
bool operand() const {
return fOperand;
}
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index ec525b1..7e828b9 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -298,7 +298,7 @@
SkDebugf(
"----- %s max pixel mismatch for %s is %d\n",
renderModeDescriptor, name.c_str(), maxErr);
-
+
if (diff) {
diff->setConfig(SkBitmap::kARGB_8888_Config, w, h);
diff->allocPixels();
@@ -885,7 +885,7 @@
struct FailRec {
SkString fName;
int fMaxPixelError;
-
+
FailRec() : fMaxPixelError(0) {}
FailRec(const SkString& name) : fName(name), fMaxPixelError(0) {}
};
diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp
index 0eb3e6b..90925f1 100644
--- a/src/core/SkMaskFilter.cpp
+++ b/src/core/SkMaskFilter.cpp
@@ -70,7 +70,7 @@
int cx = mask.fBounds.centerX();
int cy = mask.fBounds.centerY();
SkMask m;
-
+
// top-left
m.fBounds = mask.fBounds;
m.fBounds.fRight = cx;
@@ -78,7 +78,7 @@
extractMaskSubset(mask, &m);
m.fBounds.offsetTo(outerR.left(), outerR.top());
blitClippedMask(blitter, m, m.fBounds, clipR);
-
+
// top-right
m.fBounds = mask.fBounds;
m.fBounds.fLeft = cx + 1;
@@ -86,7 +86,7 @@
extractMaskSubset(mask, &m);
m.fBounds.offsetTo(outerR.right() - m.fBounds.width(), outerR.top());
blitClippedMask(blitter, m, m.fBounds, clipR);
-
+
// bottom-left
m.fBounds = mask.fBounds;
m.fBounds.fRight = cx;
@@ -94,7 +94,7 @@
extractMaskSubset(mask, &m);
m.fBounds.offsetTo(outerR.left(), outerR.bottom() - m.fBounds.height());
blitClippedMask(blitter, m, m.fBounds, clipR);
-
+
// bottom-right
m.fBounds = mask.fBounds;
m.fBounds.fLeft = cx + 1;
@@ -174,9 +174,9 @@
// if we get here, we need to (possibly) resolve the clip and blitter
SkAAClipBlitterWrapper wrapper(clip, blitter);
blitter = wrapper.getBlitter();
-
+
SkRegion::Cliperator clipper(wrapper.getRgn(), outerR);
-
+
if (!clipper.done() && (!bounder || bounder->doIRect(outerR))) {
const SkIRect& cr = clipper.rect();
do {
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index 2d4ceee..c42bd8c 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -31,7 +31,7 @@
const SkIRect& clipBounds,
SkMask* ninePatchMask,
SkIRect* outerRect) SK_OVERRIDE;
-
+
private:
SkScalar fRadius;
SkBlurMaskFilter::BlurStyle fBlurStyle;
diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp
index 9065358..086321c 100644
--- a/tests/Matrix44Test.cpp
+++ b/tests/Matrix44Test.cpp
@@ -94,13 +94,13 @@
d = a;
d.preConcat(b);
REPORTER_ASSERT(reporter, d == c);
-
+
c.mapScalars(src, dst); c.mapScalars(src + 4, dst + 4);
for (i = 0; i < 3; ++i) {
REPORTER_ASSERT(reporter, 10 == dst[i]);
REPORTER_ASSERT(reporter, 12 == dst[i + 4]);
}
-
+
c.setConcat(b, a);
d = a;