diff options
author | 2012-08-23 18:09:54 +0000 | |
---|---|---|
committer | 2012-08-23 18:09:54 +0000 | |
commit | fbfcd5602128ec010c82cb733c9cdc0a3254f9f3 (patch) | |
tree | d8b4815d15946c32ee9d254e932411e93be942bb /src/image/SkImagePriv.cpp | |
parent | 2abed834789bb64c7da740df4c47efc142b7311a (diff) |
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part I of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6485054
git-svn-id: http://skia.googlecode.com/svn/trunk@5262 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/image/SkImagePriv.cpp')
-rw-r--r-- | src/image/SkImagePriv.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/image/SkImagePriv.cpp b/src/image/SkImagePriv.cpp index 67d31b746a..a020eaff14 100644 --- a/src/image/SkImagePriv.cpp +++ b/src/image/SkImagePriv.cpp @@ -80,15 +80,15 @@ bool SkBitmapToImageInfo(const SkBitmap& bm, SkImage::Info* info) { case SkBitmap::kRGB_565_Config: info->fColorType = SkImage::kRGB_565_ColorType; break; - + case SkBitmap::kARGB_8888_Config: info->fColorType = SkImage::kPMColor_ColorType; break; - + default: return false; } - + info->fWidth = bm.width(); info->fHeight = bm.height(); info->fAlphaType = bm.isOpaque() ? SkImage::kOpaque_AlphaType : @@ -126,7 +126,7 @@ static bool needs_layer(const SkPaint& paint) { void SkImagePrivDrawPicture(SkCanvas* canvas, SkPicture* picture, SkScalar x, SkScalar y, const SkPaint* paint) { int saveCount = canvas->getSaveCount(); - + if (paint && needs_layer(*paint)) { SkRect bounds; bounds.set(x, y, @@ -138,7 +138,7 @@ void SkImagePrivDrawPicture(SkCanvas* canvas, SkPicture* picture, canvas->save(); canvas->translate(x, y); } - + canvas->drawPicture(*picture); canvas->restoreToCount(saveCount); } |