diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-21 14:00:07 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-21 14:00:07 +0000 |
| commit | 383a697692cf46951fd451f6f4c3d03634a6a1cb (patch) | |
| tree | a1dac6fe4fa0e4d34d032e70ff85503843ad39b8 /samplecode | |
| parent | c2eae4795478ab134a2315b1a9ff2c5de1d049e4 (diff) | |
store SkAlphaType inside SkBitmap, on road to support unpremul
BUG=
R=bsalomon@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/25275004
git-svn-id: http://skia.googlecode.com/svn/trunk@11877 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleDitherBitmap.cpp | 2 | ||||
| -rw-r--r-- | samplecode/SampleTinyBitmap.cpp | 3 | ||||
| -rw-r--r-- | samplecode/SampleXfermodesBlur.cpp | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/samplecode/SampleDitherBitmap.cpp b/samplecode/SampleDitherBitmap.cpp index 7f29305a51..9132ceb195 100644 --- a/samplecode/SampleDitherBitmap.cpp +++ b/samplecode/SampleDitherBitmap.cpp @@ -100,7 +100,7 @@ protected: static void setBitmapOpaque(SkBitmap* bm, bool isOpaque) { SkAutoLockPixels alp(*bm); // needed for ctable - bm->setIsOpaque(isOpaque); + bm->setAlphaType(isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType); #if 0 SkColorTable* ctable = bm->getColorTable(); if (ctable) { diff --git a/samplecode/SampleTinyBitmap.cpp b/samplecode/SampleTinyBitmap.cpp index 42866d07ad..dc7157ff99 100644 --- a/samplecode/SampleTinyBitmap.cpp +++ b/samplecode/SampleTinyBitmap.cpp @@ -57,9 +57,8 @@ protected: static void setBitmapOpaque(SkBitmap* bm, bool isOpaque) { SkAutoLockPixels alp(*bm); // needed for ctable - bm->setIsOpaque(isOpaque); + bm->setAlphaType(isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType); #if 0 - // TODO - I think we just want to not allow this anymore SkColorTable* ctable = bm->getColorTable(); if (ctable) { ctable->setIsOpaque(isOpaque); diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp index 59aa87e214..a73d9f2e20 100644 --- a/samplecode/SampleXfermodesBlur.cpp +++ b/samplecode/SampleXfermodesBlur.cpp @@ -77,9 +77,8 @@ public: const static int W = 64; const static int H = 64; XfermodesBlurView() { - fBG.setConfig(SkBitmap::kARGB_4444_Config, 2, 2, 4); + fBG.setConfig(SkBitmap::kARGB_4444_Config, 2, 2, 4, kOpaque_SkAlphaType); fBG.setPixels(gBG); - fBG.setIsOpaque(true); } protected: |