diff options
| -rw-r--r-- | bench/CoverageBench.cpp | 6 | ||||
| -rw-r--r-- | gm/bigblurs.cpp | 10 | ||||
| -rw-r--r-- | src/core/SkBlitter.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkBlitter_A8.cpp | 4 | ||||
| -rw-r--r-- | src/opts/SkBitmapProcState_arm_neon.cpp | 1 |
5 files changed, 11 insertions, 12 deletions
diff --git a/bench/CoverageBench.cpp b/bench/CoverageBench.cpp index de09733cf8..455151740a 100644 --- a/bench/CoverageBench.cpp +++ b/bench/CoverageBench.cpp @@ -43,12 +43,12 @@ public: fDraw.fClip = &fRC.bwRgn(); fDraw.fRC = &fRC; } - + protected: virtual const char* onGetName() SK_OVERRIDE { return fName.c_str(); } - + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { if (fDrawCoverage) { for (int i = 0; i < this->getLoops(); ++i) { @@ -60,7 +60,7 @@ protected: } } } - + private: typedef SkBenchmark INHERITED; }; diff --git a/gm/bigblurs.cpp b/gm/bigblurs.cpp index 6b6c7cc79c..b885f4fe7f 100644 --- a/gm/bigblurs.cpp +++ b/gm/bigblurs.cpp @@ -14,7 +14,7 @@ namespace skiagm { // This GM exercises the blurred rect nine-patching special cases when the // blurred rect is very large and/or very far from the origin. -// It creates a large blurred rect/rectori then renders the 4 corners and the +// It creates a large blurred rect/rectori then renders the 4 corners and the // middle. class BigBlursGM : public GM { public: @@ -70,21 +70,21 @@ protected: for (int i = 0; i < 2; ++i) { for (int j = 0; j < SkBlurMaskFilter::kBlurStyleCount; ++j) { - SkMaskFilter* mf = SkBlurMaskFilter::Create((SkBlurMaskFilter::BlurStyle)j, + SkMaskFilter* mf = SkBlurMaskFilter::Create((SkBlurMaskFilter::BlurStyle)j, kSigma); blurPaint.setMaskFilter(mf)->unref(); for (int k = 0; k < (int)SK_ARRAY_COUNT(origins); ++k) { canvas->save(); - SkRect clipRect = SkRect::MakeXYWH(SkIntToScalar(desiredX), + SkRect clipRect = SkRect::MakeXYWH(SkIntToScalar(desiredX), SkIntToScalar(desiredY), - SkIntToScalar(kCloseUpSize), + SkIntToScalar(kCloseUpSize), SkIntToScalar(kCloseUpSize)); canvas->clipRect(clipRect, SkRegion::kReplace_Op, false); - canvas->translate(desiredX-origins[k].fX, + canvas->translate(desiredX-origins[k].fX, desiredY-origins[k].fY); if (0 == i) { diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index f46db357d4..7012cf3141 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -942,7 +942,7 @@ SkBlitter* SkBlitter::Choose(const SkBitmap& device, return blitter; } - + switch (device.config()) { case SkBitmap::kA1_Config: SK_PLACEMENT_NEW_ARGS(blitter, SkA1_Blitter, diff --git a/src/core/SkBlitter_A8.cpp b/src/core/SkBlitter_A8.cpp index 1df033f54b..c5c184e310 100644 --- a/src/core/SkBlitter_A8.cpp +++ b/src/core/SkBlitter_A8.cpp @@ -365,7 +365,7 @@ void SkA8_Coverage_Blitter::blitAntiH(int x, int y, const SkAlpha antialias[], uint8_t* device = fDevice.getAddr8(x, y); SkDEBUGCODE(int totalCount = 0;) - + for (;;) { int count = runs[0]; SkASSERT(count >= 0); @@ -426,7 +426,7 @@ void SkA8_Coverage_Blitter::blitMask(const SkMask& mask, const SkIRect& clip) { const uint8_t* src = mask.getAddr8(x, y); const size_t srcRB = mask.fRowBytes; const size_t dstRB = fDevice.rowBytes(); - + while (--height >= 0) { memcpy(dst, src, width); dst += dstRB; diff --git a/src/opts/SkBitmapProcState_arm_neon.cpp b/src/opts/SkBitmapProcState_arm_neon.cpp index 35ba462c82..33b3627129 100644 --- a/src/opts/SkBitmapProcState_arm_neon.cpp +++ b/src/opts/SkBitmapProcState_arm_neon.cpp @@ -509,4 +509,3 @@ void platformConvolutionProcs_arm_neon(SkConvolutionProcs* procs) { procs->fConvolveHorizontally = &convolveHorizontally_neon; procs->fApplySIMDPadding = &applySIMDPadding_neon; } - |