diff options
| -rw-r--r-- | debugger/SkDrawCommand.cpp | 4 | ||||
| -rw-r--r-- | gm/cmykjpeg.cpp | 2 | ||||
| -rw-r--r-- | include/core/SkCanvas.h | 4 | ||||
| -rw-r--r-- | src/core/SkBitmapProcBicubic.cpp | 10 | ||||
| -rw-r--r-- | src/core/SkCanvas.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/debugger/SkDrawCommand.cpp b/debugger/SkDrawCommand.cpp index 0504fb5174..854c7fc5e6 100644 --- a/debugger/SkDrawCommand.cpp +++ b/debugger/SkDrawCommand.cpp @@ -12,7 +12,7 @@ // TODO(chudy): Refactor into non subclass model. -SkDrawCommand::SkDrawCommand(DrawType type) +SkDrawCommand::SkDrawCommand(DrawType type) : fDrawType(type) , fVisible(true) { } @@ -306,7 +306,7 @@ void DrawData::execute(SkCanvas* canvas) { canvas->drawData(fData, fLength); } -BeginCommentGroup::BeginCommentGroup(const char* description) +BeginCommentGroup::BeginCommentGroup(const char* description) : INHERITED(BEGIN_COMMENT_GROUP) , fDescription(description) { SkString* temp = new SkString; diff --git a/gm/cmykjpeg.cpp b/gm/cmykjpeg.cpp index b0b175bdcc..f8728c26cb 100644 --- a/gm/cmykjpeg.cpp +++ b/gm/cmykjpeg.cpp @@ -38,7 +38,7 @@ protected: SkDebugf("Could not find CMYK.jpg, please set --resourcePath correctly.\n"); return; } - + SkImageDecoder* codec = SkImageDecoder::Factory(&stream); if (codec) { stream.rewind(); diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index b315797c41..0a4b7799d5 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -856,8 +856,8 @@ public: // do nothing. Subclasses may do something with the data } - /** Add comments. beginCommentGroup/endCommentGroup open/close a new group. - Each comment added via addComment is notionally attached to its + /** Add comments. beginCommentGroup/endCommentGroup open/close a new group. + Each comment added via addComment is notionally attached to its enclosing group. Top-level comments simply belong to no group. */ virtual void beginCommentGroup(const char* description) { diff --git a/src/core/SkBitmapProcBicubic.cpp b/src/core/SkBitmapProcBicubic.cpp index c00fd0afa2..1c415fdadf 100644 --- a/src/core/SkBitmapProcBicubic.cpp +++ b/src/core/SkBitmapProcBicubic.cpp @@ -27,7 +27,7 @@ static inline SkPMColor cubicBlend(const SkFixed cc[4], SkPMColor c0, SkPMColor int r = SkClampMax(SkFixedRoundToInt(fr), a); int g = SkClampMax(SkFixedRoundToInt(fg), a); int b = SkClampMax(SkFixedRoundToInt(fb), a); - + return SkPackARGB32(a, r, g, b); } @@ -54,7 +54,7 @@ static void bicubicFilter(const SkBitmapProcState& s, int x, int y, const int maxX = s.fBitmap->width() - 1; const int maxY = s.fBitmap->height() - 1; - + while (count-- > 0) { SkPoint srcPt; s.fInvProc(*s.fInvMatrix, SkIntToScalar(x), @@ -63,14 +63,14 @@ static void bicubicFilter(const SkBitmapProcState& s, int x, int y, srcPt.fY -= SK_ScalarHalf; SkScalar fractx = srcPt.fX - SkScalarFloorToScalar(srcPt.fX); SkScalar fracty = srcPt.fY - SkScalarFloorToScalar(srcPt.fY); - + SkFixed coeffX[4], coeffY[4]; build_coeff4(coeffX, coefficients, fractx); build_coeff4(coeffY, coefficients, fracty); - + int sx = SkScalarFloorToInt(srcPt.fX); int sy = SkScalarFloorToInt(srcPt.fY); - + // Here is where we can support other tile modes (e.g. repeat or mirror) int x0 = SkClampMax(sx - 1, maxX); int x1 = SkClampMax(sx , maxX); diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index d8fd0a4481..07b615ac45 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1296,7 +1296,7 @@ bool SkCanvas::updateClipConservativelyUsingBounds(const SkRect& bounds, SkRegio // don't have to worry about getting caught in a loop. Thus anywhere // we call a virtual method, we explicitly prefix it with // SkCanvas:: to be sure to call the base-class. - + if (inverseFilled) { switch (op) { case SkRegion::kIntersect_Op: |