Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14320 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/aaclip.cpp b/gm/aaclip.cpp
index 6028d60..ce7a398 100644
--- a/gm/aaclip.cpp
+++ b/gm/aaclip.cpp
@@ -135,35 +135,35 @@
} else {
bm.eraseColor(0);
}
-
+
SkPaint paint;
paint.setAntiAlias(true);
paint.setColor(SK_ColorBLUE);
newc->drawCircle(50, 50, 49, paint);
canvas->drawBitmap(bm, 10, 10);
-
+
CGImageRef image = SkCreateCGImageRefWithColorspace(bm, NULL);
-
+
SkBitmap bm2;
SkCreateBitmapFromCGImage(&bm2, image);
CGImageRelease(image);
-
+
canvas->drawBitmap(bm2, 10, 120);
}
class CGImageGM : public skiagm::GM {
public:
CGImageGM() {}
-
+
protected:
virtual SkString onShortName() SK_OVERRIDE {
return SkString("cgimage");
}
-
+
virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(800, 250);
}
-
+
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
const struct {
SkColorType fCT;
@@ -179,16 +179,16 @@
{ kBGRA_8888_SkColorType, kUnpremul_SkAlphaType },
{ kBGRA_8888_SkColorType, kOpaque_SkAlphaType },
};
-
+
for (size_t i = 0; i < SK_ARRAY_COUNT(rec); ++i) {
SkImageInfo info = SkImageInfo::Make(100, 100, rec[i].fCT, rec[i].fAT);
test_image(canvas, info);
canvas->translate(info.width() + 10, 0);
}
}
-
+
virtual uint32_t onGetFlags() const SK_OVERRIDE { return kSkipPipe_Flag; }
-
+
private:
typedef skiagm::GM INHERITED;
};
diff --git a/gm/gradients_2pt_conical.cpp b/gm/gradients_2pt_conical.cpp
index e697606..93bddb2 100644
--- a/gm/gradients_2pt_conical.cpp
+++ b/gm/gradients_2pt_conical.cpp
@@ -372,4 +372,3 @@
static GM* MyFactory3(void*) { return new ConicalGradientsGM(kEdge_GradCaseType); }
static GMRegistry reg3(MyFactory3);
}
-
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index 613e5a3..7986d82 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
@@ -453,7 +453,7 @@
SkScalar radius2;
do {
center2.set(random->nextUScalar1(), random->nextUScalar1());
- // Need to make sure the centers are not the same or else focal point will be inside
+ // Need to make sure the centers are not the same or else focal point will be inside
} while (center1 == center2);
SkPoint diff = center2 - center1;
SkScalar diffLen = diff.length();
@@ -501,8 +501,8 @@
builder->getUniformVariable(fParamUni).appendArrayAccess(1, &p1);
// if we have a vec3 from being in perspective, convert it to a vec2 first
- SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
- const char* coords2D = coords2DString.c_str();
+ SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
+ const char* coords2D = coords2DString.c_str();
// t = p.x * focal.x +/- sqrt(p.x^2 + (1 - focal.x^2) * p.y^2)
@@ -706,8 +706,8 @@
GrGLShaderVar focal = builder->getUniformVariable(fFocalUni);
// if we have a vec3 from being in perspective, convert it to a vec2 first
- SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
- const char* coords2D = coords2DString.c_str();
+ SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
+ const char* coords2D = coords2DString.c_str();
// t = p.x * focalX + length(p)
builder->fsCodeAppendf("\tfloat %s = %s.x * %s + length(%s);\n", tName.c_str(),
@@ -955,8 +955,8 @@
GrGLShaderVar params = builder->getUniformVariable(fParamUni);
// if we have a vec3 from being in perspective, convert it to a vec2 first
- SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
- const char* coords2D = coords2DString.c_str();
+ SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
+ const char* coords2D = coords2DString.c_str();
// p = coords2D
// e = center end
@@ -1187,8 +1187,8 @@
GrGLShaderVar params = builder->getUniformVariable(fParamUni);
// if we have a vec3 from being in perspective, convert it to a vec2 first
- SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
- const char* coords2D = coords2DString.c_str();
+ SkString coords2DString = builder->ensureFSCoords2D(coords, 0);
+ const char* coords2D = coords2DString.c_str();
// output will default to transparent black (we simply won't write anything
// else to it if invalid, instead of discarding or returning prematurely)
diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp
index b82b677..fe22ea0 100644
--- a/src/ports/SkImageDecoder_CG.cpp
+++ b/src/ports/SkImageDecoder_CG.cpp
@@ -78,7 +78,7 @@
if (!this->allocPixelRef(bm, NULL)) {
return false;
}
-
+
SkAutoLockPixels alp(*bm);
if (!SkCopyPixelsFromCGImage(bm->info(), bm->rowBytes(), bm->getPixels(), image)) {
diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp
index f4374a4..01b774d 100644
--- a/src/utils/mac/SkCreateCGImageRef.cpp
+++ b/src/utils/mac/SkCreateCGImageRef.cpp
@@ -313,4 +313,3 @@
*dst = tmp;
return true;
}
-