diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-29 20:47:53 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-29 20:47:53 +0000 |
| commit | 986d681f3e7a7eb6febd9df9fe21a8d277ba2296 (patch) | |
| tree | 7139fd9e9448f5c2025ce10d0251b6eb15c1e7ef /src/views/sdl/SkOSWindow_SDL.cpp | |
| parent | 39e8d93337c7e37d2b09dc710a05a9beefef5c2c (diff) | |
setConfig -> setInfo
BUG=skia:
R=robertphillips@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/308683005
git-svn-id: http://skia.googlecode.com/svn/trunk@14978 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/views/sdl/SkOSWindow_SDL.cpp')
| -rw-r--r-- | src/views/sdl/SkOSWindow_SDL.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/views/sdl/SkOSWindow_SDL.cpp b/src/views/sdl/SkOSWindow_SDL.cpp index 2a1fae28a6..27783d41fc 100644 --- a/src/views/sdl/SkOSWindow_SDL.cpp +++ b/src/views/sdl/SkOSWindow_SDL.cpp @@ -23,22 +23,23 @@ static void post_SkEvent_event() { } static bool skia_setBitmapFromSurface(SkBitmap* dst, SDL_Surface* src) { - SkBitmap::Config config; + SkColorType ct; + SkAlphaType at; switch (src->format->BytesPerPixel) { case 2: - config = SkBitmap::kRGB_565_Config; + ct = kRGB_565_SkColorType; + at = kOpaque_SkAlphaType; break; case 4: - config = SkBitmap::kARGB_8888_Config; + ct = kN32_SkColorType; + at = kPremul_SkAlphaType; break; default: return false; } - dst->setConfig(config, src->w, src->h, src->pitch); - dst->setPixels(src->pixels); - return true; + return dst->installPixels(SkImageInfo::Make(src->w, src->h, ct, at), src->pixels, src->pitch); } SkOSWindow::SkOSWindow(void* screen) { |