diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-24 07:01:12 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-24 07:01:12 +0000 |
commit | 7f1af501f206da48a7ff791af53432c9c1c89d08 (patch) | |
tree | c9e509777ae10df81df94787f2347ed3cbe8e75e /src/image | |
parent | a7aa810894ae85306541ed949848a4dd7f907a0b (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@10299 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/image')
-rw-r--r-- | src/image/SkImagePriv.cpp | 6 | ||||
-rw-r--r-- | src/image/SkImage_Base.h | 2 | ||||
-rw-r--r-- | src/image/SkImage_Codec.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/image/SkImagePriv.cpp b/src/image/SkImagePriv.cpp index 4ff1c92bff..ca4a12cdcf 100644 --- a/src/image/SkImagePriv.cpp +++ b/src/image/SkImagePriv.cpp @@ -143,8 +143,8 @@ void SkImagePrivDrawPicture(SkCanvas* canvas, SkPicture* picture, } void SkImagePrivDrawPicture(SkCanvas* canvas, SkPicture* picture, - const SkRect* src, const SkRect& dst, const SkPaint* paint) { - int saveCount = canvas->getSaveCount(); + const SkRect* src, const SkRect& dst, const SkPaint* paint) { + int saveCount = canvas->getSaveCount(); SkMatrix matrix; SkRect tmpSrc; @@ -167,7 +167,7 @@ void SkImagePrivDrawPicture(SkCanvas* canvas, SkPicture* picture, if (!paint || !needs_layer(*paint)) { canvas->clipRect(tmpSrc); } - + canvas->drawPicture(*picture); canvas->restoreToCount(saveCount); } diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h index 431444dadb..7bd1f7e6c9 100644 --- a/src/image/SkImage_Base.h +++ b/src/image/SkImage_Base.h @@ -15,7 +15,7 @@ public: SkImage_Base(int width, int height) : INHERITED(width, height) {} virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) = 0; - virtual void onDrawRectToRect(SkCanvas*, const SkRect* src, + virtual void onDrawRectToRect(SkCanvas*, const SkRect* src, const SkRect& dst, const SkPaint*) = 0; virtual GrTexture* onGetTexture() { return NULL; } diff --git a/src/image/SkImage_Codec.cpp b/src/image/SkImage_Codec.cpp index b9a8990838..64f58a6aef 100644 --- a/src/image/SkImage_Codec.cpp +++ b/src/image/SkImage_Codec.cpp @@ -49,7 +49,7 @@ void SkImage_Codec::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPai canvas->drawBitmap(fBitmap, x, y, paint); } -void SkImage_Codec::onDrawRectToRect(SkCanvas* canvas, const SkRect* src, +void SkImage_Codec::onDrawRectToRect(SkCanvas* canvas, const SkRect* src, const SkRect& dst, const SkPaint* paint) { if (!fBitmap.pixelRef()) { if (!SkImageDecoder::DecodeMemory(fEncodedData->bytes(), fEncodedData->size(), |