aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-04-17 07:00:56 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-04-17 07:00:56 +0000
commit45fb8b60137c65106b7903285672d0f8a8041f97 (patch)
tree5313115e19473f93c984982d7b0f6983fba4ad71
parent5c082a14acbb70eec2fd6dc5a4c134799f3d8535 (diff)
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8714 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gm/bitmaprecttest.cpp3
-rw-r--r--include/core/SkGeometry.h2
-rw-r--r--src/core/SkGeometry.cpp8
-rw-r--r--tests/SurfaceTest.cpp2
4 files changed, 7 insertions, 8 deletions
diff --git a/gm/bitmaprecttest.cpp b/gm/bitmaprecttest.cpp
index b36d21480f..54e0a28267 100644
--- a/gm/bitmaprecttest.cpp
+++ b/gm/bitmaprecttest.cpp
@@ -32,7 +32,7 @@ static void test_bitmaprect(SkCanvas* canvas) {
make_bm(&bm);
canvas->drawBitmap(bm, 150, 45, NULL);
-
+
SkScalar scale = 0.472560018f;
canvas->scale(scale, scale);
canvas->drawBitmapRectToRect(bm, NULL, SkRect::MakeXYWH(100, 100, 128, 128), NULL);
@@ -64,4 +64,3 @@ private:
//////////////////////////////////////////////////////////////////////////////
DEF_GM( return new BitmapRectTestGM; )
-
diff --git a/include/core/SkGeometry.h b/include/core/SkGeometry.h
index f20195c6f8..db08316894 100644
--- a/include/core/SkGeometry.h
+++ b/include/core/SkGeometry.h
@@ -227,7 +227,7 @@ struct SkRationalQuad {
bool findYExtrema(SkScalar* t) const;
bool chopAtXExtrema(SkRationalQuad dst[2]) const;
bool chopAtYExtrema(SkRationalQuad dst[2]) const;
-
+
void computeTightBounds(SkRect* bounds) const;
void computeFastBounds(SkRect* bounds) const;
};
diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp
index 4454065e0a..a1db1c3d00 100644
--- a/src/core/SkGeometry.cpp
+++ b/src/core/SkGeometry.cpp
@@ -1409,18 +1409,18 @@ static void rat_numer_coeff(const SkScalar src[], SkScalar w, SkScalar coeff[3])
static SkScalar rat_eval_pos(const SkScalar src[], SkScalar w, SkScalar t) {
SkASSERT(src);
SkASSERT(t >= 0 && t <= SK_Scalar1);
-
+
SkScalar src2w = SkScalarMul(src[2], w);
SkScalar C = src[0];
SkScalar A = src[4] - 2 * src2w + C;
SkScalar B = 2 * (src2w - C);
SkScalar numer = SkScalarMulAdd(SkScalarMulAdd(A, t, B), t, C);
-
+
B = 2 * (w - SK_Scalar1);
C = SK_Scalar1;
A = -B;
SkScalar denom = SkScalarMulAdd(SkScalarMulAdd(A, t, B), t, C);
-
+
return SkScalarDiv(numer, denom);
}
@@ -1447,7 +1447,7 @@ static bool rat_find_extrema(const SkScalar src[], SkScalar w, SkScalar* t) {
SkScalar tValues[2];
int roots = SkFindUnitQuadRoots(coeff[0], coeff[1], coeff[2], tValues);
SkASSERT(0 == roots || 1 == roots);
-
+
if (1 == roots) {
*t = tValues[0];
return true;
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 27029a1f2d..10f04ad8c9 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -174,7 +174,7 @@ static void TestSurfaceNoCanvas(skiatest::Reporter* reporter,
surface->validate();
REPORTER_ASSERT(reporter, image1 != image2);
}
-
+
}
static void TestSurface(skiatest::Reporter* reporter, GrContextFactory* factory) {