diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-30 02:01:24 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-30 02:01:24 +0000 |
commit | c3d7d90973528527131c72549b10c2a21300e0ac (patch) | |
tree | da78cea0337259a1a57d3897008d017a83c60cdc /src | |
parent | 1c2c2fed075e05837878813d6f8fe6ca8fc7ea00 (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6632 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkDraw.cpp | 12 | ||||
-rw-r--r-- | src/core/SkRRect.cpp | 12 | ||||
-rw-r--r-- | src/utils/SkPictureUtils.cpp | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 46b10b70c6..e1ddb337f0 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -334,10 +334,10 @@ static void bw_pt_rect_16_hair_proc(const PtProcRec& rec, uint32_t value; const SkBitmap* bitmap = blitter->justAnOpaqueColor(&value); SkASSERT(bitmap); - + uint16_t* addr = bitmap->getAddr16(0, 0); int rb = bitmap->rowBytes(); - + for (int i = 0; i < count; i++) { int x = SkScalarFloorToInt(devPts[i].fX); int y = SkScalarFloorToInt(devPts[i].fY); @@ -355,10 +355,10 @@ static void bw_pt_rect_32_hair_proc(const PtProcRec& rec, uint32_t value; const SkBitmap* bitmap = blitter->justAnOpaqueColor(&value); SkASSERT(bitmap); - + SkPMColor* addr = bitmap->getAddr32(0, 0); int rb = bitmap->rowBytes(); - + for (int i = 0; i < count; i++) { int x = SkScalarFloorToInt(devPts[i].fX); int y = SkScalarFloorToInt(devPts[i].fY); @@ -417,13 +417,13 @@ static void bw_square_proc(const PtProcRec& rec, const SkPoint devPts[], for (int i = 0; i < count; i++) { SkFixed x = SkScalarToFixed(devPts[i].fX); SkFixed y = SkScalarToFixed(devPts[i].fY); - + SkXRect r; r.fLeft = x - radius; r.fTop = y - radius; r.fRight = x + radius; r.fBottom = y + radius; - + SkScan::FillXRect(r, *rec.fRC, blitter); } } diff --git a/src/core/SkRRect.cpp b/src/core/SkRRect.cpp index 03b8bbb930..db1c7dd965 100644 --- a/src/core/SkRRect.cpp +++ b/src/core/SkRRect.cpp @@ -75,14 +75,14 @@ void SkRRect::setRectRadii(const SkRect& rect, const SkVector radii[4]) { } // Proportionally scale down all radii to fit. Find the minimum ratio - // of a side and the radii on that side (for all four sides) and use + // of a side and the radii on that side (for all four sides) and use // that to scale down _all_ the radii. This algorithm is from the // W3 spec (http://www.w3.org/TR/css3-background/) section 5.5 - Overlapping // Curves: - // "Let f = min(Li/Si), where i is one of { top, right, bottom, left }, + // "Let f = min(Li/Si), where i is one of { top, right, bottom, left }, // Si is the sum of the two corresponding radii of the corners on side i, - // and Ltop = Lbottom = the width of the box, - // and Lleft = Lright = the height of the box. + // and Ltop = Lbottom = the width of the box, + // and Lleft = Lright = the height of the box. // If f < 1, then all corner radii are reduced by multiplying them by f." SkScalar scale = SK_Scalar1; @@ -143,7 +143,7 @@ bool SkRRect::contains(SkScalar x, SkScalar y) const { canonicalPt.set(x - fRect.centerX(), y - fRect.centerY()); index = kUpperLeft_Corner; // any corner will do in this case } else { - if (x < fRect.fLeft + fRadii[kUpperLeft_Corner].fX && + if (x < fRect.fLeft + fRadii[kUpperLeft_Corner].fX && y < fRect.fTop + fRadii[kUpperLeft_Corner].fY) { // UL corner index = kUpperLeft_Corner; @@ -252,7 +252,7 @@ void SkRRect::validate() const { SkASSERT(fRect.isEmpty()); SkASSERT(allRadiiZero && allRadiiSame && allCornersSquare); - SkASSERT(0 == fRect.fLeft && 0 == fRect.fTop && + SkASSERT(0 == fRect.fLeft && 0 == fRect.fTop && 0 == fRect.fRight && 0 == fRect.fBottom); break; case kRect_Type: diff --git a/src/utils/SkPictureUtils.cpp b/src/utils/SkPictureUtils.cpp index 16cf11d2e0..46ca6d6f9e 100644 --- a/src/utils/SkPictureUtils.cpp +++ b/src/utils/SkPictureUtils.cpp @@ -76,7 +76,7 @@ public: SkCanvas::Config8888 config8888) SK_OVERRIDE { not_supported(); } - + virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE { this->addBitmapFromPaint(paint); } @@ -146,7 +146,7 @@ protected: class NoSaveLayerCanvas : public SkCanvas { public: NoSaveLayerCanvas(SkDevice* device) : INHERITED(device) {} - + // turn saveLayer() into save() for speed, should not affect correctness. virtual int saveLayer(const SkRect* bounds, const SkPaint* paint, SaveFlags flags) SK_OVERRIDE { |