diff options
| author |  Hal Canary <halcanary@google.com> | 2016-10-28 12:18:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-28 16:21:19 +0000 |
| commit | 3effb79fc550fae5a55f1aba6b39cd97acd422c0 (patch) | |
| tree | c20d5792941cf2911dd262067d36d9f0362c878f /site/user/api | |
| parent | 471e89405b71f04e07ae2887bde061185e262c81 (diff) | |
Documentation: SkBitmap->SkImage
NOTRY=true
Change-Id: Ieb99a447b4198b1ba5d1bc17668b307d82d62be5
Reviewed-on: https://skia-review.googlesource.com/4121
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'site/user/api')
| -rw-r--r-- | site/user/api/skcanvas.md | 4 | ||||
| -rw-r--r-- | site/user/api/skpaint.md | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/site/user/api/skcanvas.md b/site/user/api/skcanvas.md index 818ef137a0..659cbf14a5 100644 --- a/site/user/api/skcanvas.md +++ b/site/user/api/skcanvas.md @@ -129,10 +129,10 @@ parameter. paint.setColor(SK_ColorGREEN); canvas->drawPath(path, paint); - canvas->drawBitmap(source, 128, 128, &paint); + canvas->drawImage(image, 128, 128, &paint); SkRect rect2 = SkRect::MakeXYWH(0, 0, 40, 60); - canvas->drawBitmapRect(source, rect2, &paint); + canvas->drawImageRect(image, rect2, &paint); SkPaint paint2; const char text[] = "Hello, Skia!"; diff --git a/site/user/api/skpaint.md b/site/user/api/skpaint.md index bde8eb639e..4b4a1070f5 100644 --- a/site/user/api/skpaint.md +++ b/site/user/api/skpaint.md @@ -252,10 +252,11 @@ Several shaders are defined (besides the linear gradient already mentioned): matrix.setScale(0.75f, 0.75f); matrix.preRotate(30.0f); SkPaint paint; - paint.setShader(SkShader::MakeBitmapShader(source, - SkShader::kRepeat_TileMode, - SkShader::kRepeat_TileMode, - &matrix)); + paint.setShader( + image->makeShader( + SkShader::kRepeat_TileMode, + SkShader::kRepeat_TileMode, + &matrix)); canvas->drawPaint(paint); <a href='https://fiddle.skia.org/c/@skpaint_bitmap_shader'><img @@ -403,7 +404,7 @@ SkColorFilter void f(SkCanvas* c, SkScalar x, SkScalar y, SkScalar colorMatrix[20]) { SkPaint paint; paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(colorMatrix)); - c->drawBitmap(source, x, y, &paint); + c->drawImage(image, x, y, &paint); } void draw(SkCanvas* c) { @@ -480,8 +481,9 @@ SkColorFilter ct[i] = x < 0 ? 0 : x > 255 ? 255 : x; } SkPaint paint; - paint.setColorFilter(SkTableColorFilter::MakeARGB(nullptr, ct, ct, ct)); - canvas->drawBitmap(source, 0, 0, &paint); + paint.setColorFilter( + SkTableColorFilter::MakeARGB(nullptr, ct, ct, ct)); + canvas->drawImage(image, 0, 0, &paint); } <a href='https://fiddle.skia.org/c/@skpaint_color_table_filter'><img |