aboutsummaryrefslogtreecommitdiff
path: root/samplecode/SampleBitmapRect.cpp
diff options
context:
space:
mode:
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-17 02:55:57 +0000
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-17 02:55:57 +0000
commita8c183125f2861067daf432cada06d431a795cd0 (patch)
tree202e5fd40988c363c3d83fd049e1b08b90bd683a /samplecode/SampleBitmapRect.cpp
parent0817a87970849a7e4aa9cfab9ec362b1cc9e3674 (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/SampleBitmapRect.cpp')
-rw-r--r--samplecode/SampleBitmapRect.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp
index 422ed583ef..cf1196c62d 100644
--- a/samplecode/SampleBitmapRect.cpp
+++ b/samplecode/SampleBitmapRect.cpp
@@ -34,8 +34,7 @@ class GrContext;
#define SCALAR_SIZE SkIntToScalar(INT_SIZE)
static void make_bitmap(SkBitmap* bitmap) {
- bitmap->setConfig(SkBitmap::kARGB_8888_Config, INT_SIZE, INT_SIZE);
- bitmap->allocPixels();
+ bitmap->allocN32Pixels(INT_SIZE, INT_SIZE);
SkCanvas canvas(*bitmap);
canvas.drawColor(SK_ColorRED);
@@ -164,8 +163,7 @@ static void make_big_bitmap(SkBitmap* bm) {
const int BIG_W = SkScalarRoundToInt(paint.measureText(gText, strlen(gText)));
- bm->setConfig(SkBitmap::kARGB_8888_Config, BIG_W, BIG_H);
- bm->allocPixels();
+ bm->allocN32Pixels(BIG_W, BIG_H);
bm->eraseColor(SK_ColorWHITE);
SkCanvas canvas(*bm);