diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 02:55:57 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 02:55:57 +0000 |
| commit | a8c183125f2861067daf432cada06d431a795cd0 (patch) | |
| tree | 202e5fd40988c363c3d83fd049e1b08b90bd683a /samplecode/SampleDitherBitmap.cpp | |
| parent | 0817a87970849a7e4aa9cfab9ec362b1cc9e3674 (diff) | |
use SkColorType instead of SkBitmap::Config in samplecode
BUG=skia:
R=reed@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/169063002
git-svn-id: http://skia.googlecode.com/svn/trunk@13473 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleDitherBitmap.cpp')
| -rw-r--r-- | samplecode/SampleDitherBitmap.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/samplecode/SampleDitherBitmap.cpp b/samplecode/SampleDitherBitmap.cpp index dc439002d0..d6d15e9887 100644 --- a/samplecode/SampleDitherBitmap.cpp +++ b/samplecode/SampleDitherBitmap.cpp @@ -60,8 +60,9 @@ static SkBitmap make_bitmap() { SkColorTable* ctable = new SkColorTable(c, 256, kOpaque_SkAlphaType); SkBitmap bm; - bm.setConfig(SkBitmap::kIndex8_Config, 256, 32); - bm.allocPixels(ctable); + bm.allocPixels(SkImageInfo::Make(256, 32, kIndex_8_SkColorType, + kPremul_SkAlphaType), + NULL, ctable); ctable->unref(); bm.lockPixels(); @@ -101,14 +102,6 @@ protected: static void setBitmapOpaque(SkBitmap* bm, bool isOpaque) { SkAutoLockPixels alp(*bm); // needed for ctable bm->setAlphaType(isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType); -#if 0 - SkColorTable* ctable = bm->getColorTable(); - if (ctable) { - if (ctable->isOpaque() != isOpaque) { - // how do we change a colortable? don't want to - } - } -#endif } static void draw2(SkCanvas* canvas, const SkBitmap& bm) { |