diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkPicture.cpp | 2 | ||||
| -rw-r--r-- | src/image/SkImage.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index 0d31ab403e..e226c2642a 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -297,7 +297,7 @@ bool SkPicture::StreamIsSKP(SkStream* stream, SkPictInfo* pInfo) { bool SkPicture::BufferIsSKP(SkReadBuffer& buffer, SkPictInfo* pInfo) { // Check magic bytes. char magic[sizeof(kMagic)]; - + if (!buffer.readByteArray(magic, sizeof(kMagic)) || (0 != memcmp(magic, kMagic, sizeof(kMagic)))) { return false; diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 9b0a0b2cf8..a567c41ca8 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -55,7 +55,7 @@ bool SkImage::readPixels(SkBitmap* bitmap, const SkIRect* subset) const { if (NULL == bitmap) { return false; } - + SkIRect bounds = SkIRect::MakeWH(this->width(), this->height()); // trim against the bitmap, if its already been allocated @@ -126,7 +126,7 @@ bool SkImage_Base::onReadPixels(SkBitmap* bitmap, const SkIRect& subset) const { srcR.set(subset); dstR = srcR; dstR.offset(-dstR.left(), -dstR.top()); - + SkCanvas canvas(*bitmap); SkPaint paint; @@ -136,4 +136,3 @@ bool SkImage_Base::onReadPixels(SkBitmap* bitmap, const SkIRect& subset) const { const_cast<SkImage_Base*>(this)->onDrawRectToRect(&canvas, &srcR, dstR, NULL); return true; } - |