promote SkImage::AlphaType to SkAlphaType
BUG=
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/24130009
git-svn-id: http://skia.googlecode.com/svn/trunk@11421 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/fatpathfill.cpp b/gm/fatpathfill.cpp
index 4498879..8b89232 100644
--- a/gm/fatpathfill.cpp
+++ b/gm/fatpathfill.cpp
@@ -16,13 +16,7 @@
#define REPEAT_LOOP 5
static SkSurface* new_surface(int width, int height) {
- SkImage::Info info = {
- width,
- height,
- SkImage::kPMColor_ColorType,
- SkImage::kPremul_AlphaType
- };
- return SkSurface::NewRaster(info);
+ return SkSurface::NewRasterPMColor(width, height);
}
static void draw_pixel_centers(SkCanvas* canvas) {
diff --git a/gm/image.cpp b/gm/image.cpp
index 6dada0d..e9378be 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -178,12 +178,9 @@
// since we draw into this directly, we need to start fresh
sk_bzero(fBuffer, fBufferSize);
- SkImage::Info info;
-
- info.fWidth = W;
- info.fHeight = H;
- info.fColorType = SkImage::kPMColor_ColorType;
- info.fAlphaType = SkImage::kPremul_AlphaType;
+ SkImage::Info info = {
+ W, H, SkImage::kPMColor_ColorType, kPremul_SkAlphaType
+ };
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 e8a97e2..0f2591c 100644
--- a/gm/srcmode.cpp
+++ b/gm/srcmode.cpp
@@ -121,7 +121,7 @@
size.width(),
size.height(),
SkImage::kPMColor_ColorType,
- SkImage::kPremul_AlphaType
+ kPremul_SkAlphaType
};
#if SK_SUPPORT_GPU
SkBaseDevice* dev = canvas->getDevice();