Revert "change SkColorTable to be immutable"
This reverts commit 1c0ff422868b3badf5ffe0790a5d051d1896e2f7.
BUG=
Review URL: https://codereview.chromium.org/26709002
git-svn-id: http://skia.googlecode.com/svn/trunk@11677 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleDitherBitmap.cpp b/samplecode/SampleDitherBitmap.cpp
index 7f29305..df727c4 100644
--- a/samplecode/SampleDitherBitmap.cpp
+++ b/samplecode/SampleDitherBitmap.cpp
@@ -54,13 +54,14 @@
}
static SkBitmap make_bitmap() {
- SkPMColor c[256];
+ SkBitmap bm;
+ SkColorTable* ctable = new SkColorTable(256);
+
+ SkPMColor* c = ctable->lockColors();
for (int i = 0; i < 256; i++) {
c[i] = SkPackARGB32(0xFF, i, 0, 0);
}
- SkColorTable* ctable = new SkColorTable(c, 256, kOpaque_SkAlphaType);
-
- SkBitmap bm;
+ ctable->unlockColors(true);
bm.setConfig(SkBitmap::kIndex8_Config, 256, 32);
bm.allocPixels(ctable);
ctable->unref();
@@ -101,14 +102,10 @@
static void setBitmapOpaque(SkBitmap* bm, bool isOpaque) {
SkAutoLockPixels alp(*bm); // needed for ctable
bm->setIsOpaque(isOpaque);
-#if 0
SkColorTable* ctable = bm->getColorTable();
if (ctable) {
- if (ctable->isOpaque() != isOpaque) {
- // how do we change a colortable? don't want to
- }
+ ctable->setIsOpaque(isOpaque);
}
-#endif
}
static void draw2(SkCanvas* canvas, const SkBitmap& bm) {