diff options
| author | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-10 14:44:56 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-10 14:44:56 +0000 |
| commit | 0a6151d66cc32d91eca037c91e557158cf8a2be2 (patch) | |
| tree | 7fe96285f9fee5c8804bbbc60dd0395b983511a0 /samplecode/SampleTinyBitmap.cpp | |
| parent | b006fe7e2f6178ce076a5e2c76b4540d3d27ca98 (diff) | |
Revert "Revert "change SkColorTable to be immutable""
This reverts commit b8162cb840f4cb6002ef68d5ac775c6a122c52a9.
Fixed was call-sites in benches that used the (now gone) setIsOpaque api.
R=scroggo@google.com
Review URL: https://codereview.chromium.org/26572006
git-svn-id: http://skia.googlecode.com/svn/trunk@11695 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleTinyBitmap.cpp')
| -rw-r--r-- | samplecode/SampleTinyBitmap.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/samplecode/SampleTinyBitmap.cpp b/samplecode/SampleTinyBitmap.cpp index 16cbce4adc..42866d07ad 100644 --- a/samplecode/SampleTinyBitmap.cpp +++ b/samplecode/SampleTinyBitmap.cpp @@ -13,15 +13,15 @@ #include "SkUtils.h" static SkBitmap make_bitmap() { - SkBitmap bm; const int N = 1; - SkColorTable* ctable = new SkColorTable(N); - SkPMColor* c = ctable->lockColors(); + SkPMColor c[N]; for (int i = 0; i < N; i++) { c[i] = SkPackARGB32(0x80, 0x80, 0, 0); } - ctable->unlockColors(true); + SkColorTable* ctable = new SkColorTable(c, N); + + SkBitmap bm; bm.setConfig(SkBitmap::kIndex8_Config, 1, 1); bm.allocPixels(ctable); ctable->unref(); @@ -58,10 +58,13 @@ protected: static void setBitmapOpaque(SkBitmap* bm, bool isOpaque) { SkAutoLockPixels alp(*bm); // needed for ctable bm->setIsOpaque(isOpaque); +#if 0 + // TODO - I think we just want to not allow this anymore SkColorTable* ctable = bm->getColorTable(); if (ctable) { ctable->setIsOpaque(isOpaque); } +#endif } virtual void onDrawContent(SkCanvas* canvas) { |