diff options
author | 2013-01-23 07:06:17 +0000 | |
---|---|---|
committer | 2013-01-23 07:06:17 +0000 | |
commit | 98ded84b80918ac1e40224c125922941f3b2eb03 (patch) | |
tree | de0f13a4308ae5f0b76b8911818d14f5a0322c9b /src | |
parent | c9dc537293b9a8916c371551fa19004b2433c46e (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7332 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkBitmapProcState.cpp | 2 | ||||
-rw-r--r-- | src/core/SkXfermode.cpp | 2 | ||||
-rw-r--r-- | src/effects/SkArithmeticMode.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrContext.cpp | 14 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp index 4d66860c8d..92e55e876a 100644 --- a/src/core/SkBitmapProcState.cpp +++ b/src/core/SkBitmapProcState.cpp @@ -456,7 +456,7 @@ static void S32_D32_constX_shaderproc(const SkBitmapProcState& s, SkIntToScalar(y) + SK_ScalarHalf, &pt); // When the matrix has a scale component the setup code in - // chooseProcs multiples the inverse matrix by the inverse of the + // chooseProcs multiples the inverse matrix by the inverse of the // bitmap's width and height. Since this method is going to do // its own tiling and sampling we need to undo that here. if (SkShader::kClamp_TileMode != s.fTileModeX || diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index 8c62bb7ad4..a248cda134 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -779,7 +779,7 @@ void SkProcCoeffXfermode::toString(SkString* str) const { str->append(gModeStrings[fMode]); static const char* gCoeffStrings[kCoeffCount] = { - "Zero", "One", "SC", "ISC", "DC", "IDC", "SA", "ISA", "DA", "IDA" + "Zero", "One", "SC", "ISC", "DC", "IDC", "SA", "ISA", "DA", "IDA" }; str->append(" src: "); diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp index cb3657f35b..df6ff50fe4 100644 --- a/src/effects/SkArithmeticMode.cpp +++ b/src/effects/SkArithmeticMode.cpp @@ -28,7 +28,7 @@ public: private: SkScalar fK[4]; - typedef SkXfermode INHERITED; + typedef SkXfermode INHERITED; }; static int pinToByte(int value) { diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 077d2465d3..be057fc378 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -950,7 +950,7 @@ void GrContext::drawOval(const GrPaint& paint, path.addOval(oval); this->drawPath(paint, path, stroke); return; - } + } internalDrawOval(paint, oval, stroke); } @@ -960,10 +960,10 @@ bool GrContext::canDrawOval(const GrPaint& paint, const GrRect& oval, const SkSt if (!paint.isAntiAlias()) { return false; } - + // we can draw circles in any style - bool isCircle = SkScalarNearlyEqual(oval.width(), oval.height()) - && circleStaysCircle(this->getMatrix()); + bool isCircle = SkScalarNearlyEqual(oval.width(), oval.height()) + && circleStaysCircle(this->getMatrix()); // and for now, axis-aligned ellipses only with fill or stroke-and-fill SkStrokeRec::Style style = stroke.getStyle(); bool isStroke = (style == SkStrokeRec::kStroke_Style || style == SkStrokeRec::kHairline_Style); @@ -978,11 +978,11 @@ void GrContext::internalDrawOval(const GrPaint& paint, SkScalar xRadius = SkScalarHalf(oval.width()); SkScalar yRadius = SkScalarHalf(oval.height()); - + SkScalar strokeWidth = stroke.getWidth(); SkStrokeRec::Style style = stroke.getStyle(); - bool isCircle = SkScalarNearlyEqual(xRadius, yRadius) && circleStaysCircle(this->getMatrix()); + bool isCircle = SkScalarNearlyEqual(xRadius, yRadius) && circleStaysCircle(this->getMatrix()); #ifdef SK_DEBUG { // we should have checked for this previously @@ -1080,7 +1080,7 @@ void GrContext::internalDrawOval(const GrPaint& paint, } SkScalar ratio = SkScalarDiv(xRadius, yRadius); - + for (int i = 0; i < 4; ++i) { verts[i].fCenter = center; verts[i].fOuterRadius = xRadius; |