diff options
author | 2013-11-01 13:46:54 +0000 | |
---|---|---|
committer | 2013-11-01 13:46:54 +0000 | |
commit | 2bd8b8100529c96c81c30f749f672f4caf775b04 (patch) | |
tree | 5a7468a4570ecf07a7089afbfbfeebb5c773555c /src/image/SkSurface_Picture.cpp | |
parent | 05d56ebbf385c8723c9bed3409739055afa3b073 (diff) |
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
Diffstat (limited to 'src/image/SkSurface_Picture.cpp')
-rw-r--r-- | src/image/SkSurface_Picture.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/image/SkSurface_Picture.cpp b/src/image/SkSurface_Picture.cpp index 915530c8dc..8cfe6e87d5 100644 --- a/src/image/SkSurface_Picture.cpp +++ b/src/image/SkSurface_Picture.cpp @@ -20,7 +20,7 @@ public: virtual ~SkSurface_Picture(); virtual SkCanvas* onNewCanvas() SK_OVERRIDE; - virtual SkSurface* onNewSurface(const SkImage::Info&) SK_OVERRIDE; + virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE; virtual SkImage* onNewImageSnapshot() SK_OVERRIDE; virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) SK_OVERRIDE; @@ -51,7 +51,7 @@ SkCanvas* SkSurface_Picture::onNewCanvas() { return canvas; } -SkSurface* SkSurface_Picture::onNewSurface(const SkImage::Info& info) { +SkSurface* SkSurface_Picture::onNewSurface(const SkImageInfo& info) { return SkSurface::NewPicture(info.fWidth, info.fHeight); } @@ -59,9 +59,9 @@ SkImage* SkSurface_Picture::onNewImageSnapshot() { if (fPicture) { return SkNewImageFromPicture(fPicture); } else { - SkImage::Info info; + SkImageInfo info; info.fWidth = info.fHeight = 0; - info.fColorType = SkImage::kPMColor_ColorType; + info.fColorType = kPMColor_SkColorType; info.fAlphaType = kOpaque_SkAlphaType; return SkImage::NewRasterCopy(info, NULL, 0); } |