diff options
| author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-09 16:34:47 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-09 16:34:47 +0000 |
| commit | 9864c24e40448ef64b1fe367eee1d63a872e51b8 (patch) | |
| tree | e2f4f0f77d9e8176ab572a061e2594dbd8c9e01e /samplecode/SampleDitherBitmap.cpp | |
| parent | b6aec0558810f5d3531ff7d530be0a3d148c5639 (diff) | |
change SkColorTable to be immutable
BUG=
R=scroggo@google.com
Review URL: https://codereview.chromium.org/25353002
git-svn-id: http://skia.googlecode.com/svn/trunk@11676 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleDitherBitmap.cpp')
| -rw-r--r-- | samplecode/SampleDitherBitmap.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/samplecode/SampleDitherBitmap.cpp b/samplecode/SampleDitherBitmap.cpp index df727c4203..7f29305a51 100644 --- a/samplecode/SampleDitherBitmap.cpp +++ b/samplecode/SampleDitherBitmap.cpp @@ -54,14 +54,13 @@ static void test_pathregion() { } static SkBitmap make_bitmap() { - SkBitmap bm; - SkColorTable* ctable = new SkColorTable(256); - - SkPMColor* c = ctable->lockColors(); + SkPMColor c[256]; for (int i = 0; i < 256; i++) { c[i] = SkPackARGB32(0xFF, i, 0, 0); } - ctable->unlockColors(true); + SkColorTable* ctable = new SkColorTable(c, 256, kOpaque_SkAlphaType); + + SkBitmap bm; bm.setConfig(SkBitmap::kIndex8_Config, 256, 32); bm.allocPixels(ctable); ctable->unref(); @@ -102,10 +101,14 @@ protected: static void setBitmapOpaque(SkBitmap* bm, bool isOpaque) { SkAutoLockPixels alp(*bm); // needed for ctable bm->setIsOpaque(isOpaque); +#if 0 SkColorTable* ctable = bm->getColorTable(); if (ctable) { - ctable->setIsOpaque(isOpaque); + if (ctable->isOpaque() != isOpaque) { + // how do we change a colortable? don't want to + } } +#endif } static void draw2(SkCanvas* canvas, const SkBitmap& bm) { |