diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkDevice.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkPicture.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkPicturePlayback.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkPictureRecord.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp index 8b7131a940..d06f6e677d 100644 --- a/src/core/SkDevice.cpp +++ b/src/core/SkDevice.cpp @@ -377,7 +377,7 @@ void SkDevice::drawBitmap(const SkDraw& draw, const SkBitmap& bitmap, void SkDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap, const SkRect* src, const SkRect& dst, - const SkPaint& paint, + const SkPaint& paint, SkCanvas::DrawBitmapRectFlags flags) { SkMatrix matrix; SkRect bitmapBounds, tmpSrc, tmpDst; diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index 06b54f610c..097e0ea0c7 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -277,7 +277,7 @@ bool SkPicture::StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) { #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO && PRIOR_PICTURE_VERSION != info.fVersion // TODO: remove when .skps regenerated #endif - ) { + ) { return false; } diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp index 77c2afd494..9e9cfc4c17 100644 --- a/src/core/SkPicturePlayback.cpp +++ b/src/core/SkPicturePlayback.cpp @@ -837,7 +837,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback) SkCanvas::DrawBitmapRectFlags flags; #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO flags = SkCanvas::kNone_DrawBitmapRectflag; - // TODO: remove this backwards compatibility code once the .skps are + // TODO: remove this backwards compatibility code once the .skps are // regenerated SkASSERT(32 == size || 48 == size || // old sizes 36 == size || 52 == size); // new sizes diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h index 4e30302e39..51547a4741 100644 --- a/src/core/SkPictureRecord.h +++ b/src/core/SkPictureRecord.h @@ -59,7 +59,7 @@ public: virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src, - const SkRect& dst, const SkPaint* paint, + const SkRect& dst, const SkPaint* paint, DrawBitmapRectFlags flags) SK_OVERRIDE; virtual void drawBitmapMatrix(const SkBitmap&, const SkMatrix&, const SkPaint*) SK_OVERRIDE; |