aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-01 07:01:39 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-01 07:01:39 +0000
commit26da7f00aedba107d4b3e382283034e265db09b6 (patch)
tree80821ef4218a63c070bd30e3bfb057b39ac37b70 /src/core
parente1613d8284d94d39f7c1b784853cc7d0d019b5b1 (diff)
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9387 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkBitmapProcBicubic.cpp6
-rw-r--r--src/core/SkEdgeBuilder.cpp4
-rw-r--r--src/core/SkPath.cpp12
3 files changed, 11 insertions, 11 deletions
diff --git a/src/core/SkBitmapProcBicubic.cpp b/src/core/SkBitmapProcBicubic.cpp
index 1616808484..f2cd0e30e7 100644
--- a/src/core/SkBitmapProcBicubic.cpp
+++ b/src/core/SkBitmapProcBicubic.cpp
@@ -42,7 +42,7 @@ static void build_coeff4(SkFixed dst[4], float t) {
DS( 1.0 / 18.0), DS( 9.0 / 18.0), DS( 27.0 / 18.0), DS(-21.0 / 18.0),
DS( 0.0 / 18.0), DS( 0.0 / 18.0), DS( -6.0 / 18.0), DS( 7.0 / 18.0),
};
-
+
dst[0] = SkFloatToFixed(poly_eval(&coefficients[ 0], t));
dst[1] = SkFloatToFixed(poly_eval(&coefficients[ 4], t));
dst[2] = SkFloatToFixed(poly_eval(&coefficients[ 8], t));
@@ -107,7 +107,7 @@ static void bicubicFilter(const SkBitmapProcState& s, int x, int y,
int y1 = SkClampMax(sy , maxY);
int y2 = SkClampMax(sy + 1, maxY);
int y3 = SkClampMax(sy + 2, maxY);
-
+
*colors++ = doBicubicFilter( s.fBitmap, coeffX, coeffY, x0, x1, x2, x3, y0, y1, y2, y3 );
x++;
@@ -176,7 +176,7 @@ SkBitmapProcState::chooseBicubicFilterProc(const SkPaint& paint) {
if (0xFF != paint.getAlpha()) {
return NULL;
}
-
+
if (fInvType & SkMatrix::kAffine_Mask) {
return bicubicFilter;
} else if (fInvType & SkMatrix::kScale_Mask) {
diff --git a/src/core/SkEdgeBuilder.cpp b/src/core/SkEdgeBuilder.cpp
index 9ac4e97443..baf83c17a5 100644
--- a/src/core/SkEdgeBuilder.cpp
+++ b/src/core/SkEdgeBuilder.cpp
@@ -168,7 +168,7 @@ int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip,
fShiftUp = shiftUp;
SkScalar conicTol = SK_ScalarHalf * (1 << shiftUp);
-
+
if (SkPath::kLine_SegmentMask == path.getSegmentMasks()) {
return this->buildPoly(path, iclip, shiftUp);
}
@@ -250,7 +250,7 @@ int SkEdgeBuilder::build(const SkPath& path, const SkIRect* iclip,
const int MAX_QUADS = 1 << MAX_POW2;
const int MAX_QUAD_PTS = 1 + 2 * MAX_QUADS;
SkPoint storage[MAX_QUAD_PTS];
-
+
SkConic conic;
conic.set(pts, iter.conicWeight());
int pow2 = conic.computeQuadPOW2(conicTol);
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 7485c0b4ff..8e9be85596 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -810,15 +810,15 @@ void SkPath::rLineTo(SkScalar x, SkScalar y) {
void SkPath::quadTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2) {
SkDEBUGCODE(this->validate();)
-
+
this->injectMoveToIfNeeded();
-
+
SkPathRef::Editor ed(&fPathRef);
SkPoint* pts = ed.growForVerb(kQuad_Verb);
pts[0].set(x1, y1);
pts[1].set(x2, y2);
fSegmentMask |= kQuad_SegmentMask;
-
+
GEN_ID_INC;
DIRTY_AFTER_EDIT;
}
@@ -841,15 +841,15 @@ void SkPath::conicTo(SkScalar x1, SkScalar y1, SkScalar x2, SkScalar y2,
this->quadTo(x1, y1, x2, y2);
} else {
SkDEBUGCODE(this->validate();)
-
+
this->injectMoveToIfNeeded();
-
+
SkPathRef::Editor ed(&fPathRef);
SkPoint* pts = ed.growForConic(w);
pts[0].set(x1, y1);
pts[1].set(x2, y2);
fSegmentMask |= kConic_SegmentMask;
-
+
GEN_ID_INC;
DIRTY_AFTER_EDIT;
}