diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-15 02:38:22 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-15 02:38:22 +0000 |
| commit | 32678d9a453e2c9fd26e92be429cdd84250b4d85 (patch) | |
| tree | 030829a85feda7e6488b7d46f8ad87a0e2fdf443 /gm | |
| parent | 78f6ddc1a0a1b1833c71f636e89e796505688b01 (diff) | |
use some helper Make functions to initialize SkImageInfo
BUG=
R=halcanary@google.com, scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/137993012
git-svn-id: http://skia.googlecode.com/svn/trunk@13081 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/image.cpp | 4 | ||||
| -rw-r--r-- | gm/srcmode.cpp | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/gm/image.cpp b/gm/image.cpp index 93e16b718c..f5f5228c61 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -178,9 +178,7 @@ protected: // since we draw into this directly, we need to start fresh sk_bzero(fBuffer, fBufferSize); - SkImageInfo info = { - W, H, kPMColor_SkColorType, kPremul_SkAlphaType - }; + SkImageInfo info = SkImageInfo::MakeN32Premul(W, H); SkAutoTUnref<SkSurface> surf0(SkSurface::NewRasterDirect(info, fBuffer, RB)); SkAutoTUnref<SkSurface> surf1(SkSurface::NewRaster(info)); SkAutoTUnref<SkSurface> surf2(SkSurface::NewPicture(info.fWidth, info.fHeight)); diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp index 666a36bb04..6aa236f3f4 100644 --- a/gm/srcmode.cpp +++ b/gm/srcmode.cpp @@ -117,12 +117,7 @@ protected: static SkSurface* compat_surface(SkCanvas* canvas, const SkISize& size, bool skipGPU) { - SkImageInfo info = { - size.width(), - size.height(), - kPMColor_SkColorType, - kPremul_SkAlphaType - }; + SkImageInfo info = SkImageInfo::MakeN32Premul(size); #if SK_SUPPORT_GPU SkBaseDevice* dev = canvas->getDevice(); if (!skipGPU && dev->accessRenderTarget()) { |