diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 02:55:57 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 02:55:57 +0000 |
| commit | a8c183125f2861067daf432cada06d431a795cd0 (patch) | |
| tree | 202e5fd40988c363c3d83fd049e1b08b90bd683a /samplecode/SampleFilter.cpp | |
| parent | 0817a87970849a7e4aa9cfab9ec362b1cc9e3674 (diff) | |
use SkColorType instead of SkBitmap::Config in samplecode
BUG=skia:
R=reed@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/169063002
git-svn-id: http://skia.googlecode.com/svn/trunk@13473 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleFilter.cpp')
| -rw-r--r-- | samplecode/SampleFilter.cpp | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/samplecode/SampleFilter.cpp b/samplecode/SampleFilter.cpp index 7f902d5b2e..1b26bf2463 100644 --- a/samplecode/SampleFilter.cpp +++ b/samplecode/SampleFilter.cpp @@ -22,13 +22,14 @@ #include "SkDither.h" static void make_bm(SkBitmap* bm) { - const SkColor colors[] = { - SK_ColorRED, SK_ColorGREEN, - SK_ColorBLUE, SK_ColorWHITE + const SkPMColor colors[] = { + SkPreMultiplyColor(SK_ColorRED), SkPreMultiplyColor(SK_ColorGREEN), + SkPreMultiplyColor(SK_ColorBLUE), SkPreMultiplyColor(SK_ColorWHITE) }; SkColorTable* ctable = new SkColorTable(colors, 4); - bm->setConfig(SkBitmap::kIndex8_Config, 2, 2); - bm->allocPixels(ctable); + bm->allocPixels(SkImageInfo::Make(2, 2, kIndex_8_SkColorType, + kOpaque_SkAlphaType), + NULL, ctable); ctable->unref(); *bm->getAddr8(0, 0) = 0; @@ -39,22 +40,8 @@ static void make_bm(SkBitmap* bm) { static SkScalar draw_bm(SkCanvas* canvas, const SkBitmap& bm, SkScalar x, SkScalar y, SkPaint* paint) { -#if 1 canvas->drawBitmap(bm, x, y, paint); return SkIntToScalar(bm.width()) * 5/4; -#else - SkAutoCanvasRestore acr(canvas, true); - canvas->translate(x, y); - - SkScalar w = SkIntToScalar(bm.width()); - SkScalar h = SkIntToScalar(bm.height()); - SkShader* s = SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode); - paint->setShader(s)->unref(); - canvas->drawRect(SkRect::MakeWH(w, h), *paint); - paint->setShader(NULL); - return w * 5/4; -#endif } static SkScalar draw_set(SkCanvas* c, const SkBitmap& bm, SkScalar x, SkPaint* p) { |