commit 2bd8b8100529c96c81c30f749f672f4caf775b04
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Nov 01 13:46:54 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Nov 01 13:46:54 2013 +0000
tree 5a7468a4570ecf07a7089afbfbfeebb5c773555c
parent 05d56ebbf385c8723c9bed3409739055afa3b073

move SkImage::ColorType into SkColorType

objective -- move clients over to SkImage

tasks
- use SkImageInfo instead of SkBitmap::Config
- add support for colortables to SkImage
- add drawImage to SkCanvas
- return SkImage from readPixels

This CL works towards the first task

R=robertphillips@google.com

Review URL: https://codereview.chromium.org/54363008

git-svn-id: http://skia.googlecode.com/svn/trunk@12077 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/srcmode.cpp

diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp
index 0f2591c..666a36b 100644
--- a/gm/srcmode.cpp
+++ b/gm/srcmode.cpp
@@ -117,10 +117,10 @@
 
     static SkSurface* compat_surface(SkCanvas* canvas, const SkISize& size,
                                      bool skipGPU) {
-        SkImage::Info info = {
+        SkImageInfo info = {
             size.width(),
             size.height(),
-            SkImage::kPMColor_ColorType,
+            kPMColor_SkColorType,
             kPremul_SkAlphaType
         };
 #if SK_SUPPORT_GPU