aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/tinybitmap.cpp
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-09 16:49:45 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-09 16:49:45 +0000
commit48d9ff5b3475ad4b345fae35e1ce36b34069691b (patch)
tree031139bad8087d5953e8494c8f593da5ecbefcdd /gm/tinybitmap.cpp
parent9864c24e40448ef64b1fe367eee1d63a872e51b8 (diff)
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
Diffstat (limited to 'gm/tinybitmap.cpp')
-rw-r--r--gm/tinybitmap.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/gm/tinybitmap.cpp b/gm/tinybitmap.cpp
index 6cb9eded73..26bf25e665 100644
--- a/gm/tinybitmap.cpp
+++ b/gm/tinybitmap.cpp
@@ -14,10 +14,13 @@
namespace skiagm {
static SkBitmap make_bitmap() {
- const SkPMColor c[] = { SkPackARGB32(0x80, 0x80, 0, 0) };
- SkColorTable* ctable = new SkColorTable(c, SK_ARRAY_COUNT(c));
-
SkBitmap bm;
+
+ SkColorTable* ctable = new SkColorTable(1);
+ SkPMColor* c = ctable->lockColors();
+ c[0] = SkPackARGB32(0x80, 0x80, 0, 0);
+ ctable->unlockColors(true);
+
bm.setConfig(SkBitmap::kIndex8_Config, 1, 1);
bm.allocPixels(ctable);
ctable->unref();