diff options
| author |  mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-17 02:32:04 +0000 |
|---|---|---|
| committer | mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-17 02:32:04 +0000 |
| commit | be2aa2aa1f8bf73d974bdd9438fc741bbf0cfbe6 (patch) | |
| tree | cf44edcfc197a93f1741661e105df15dc1da1250 | |
| parent | 3565f0fd25afad52b4a9dbb808d877e957475c6c (diff) | |
use AsMode instead of deprecated IsMode
git-svn-id: http://skia.googlecode.com/svn/trunk@2705 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/core/SkBlitter.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkDraw.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp index 6bb0db4a45..307d51b340 100644 --- a/src/core/SkBlitter.cpp +++ b/src/core/SkBlitter.cpp @@ -716,7 +716,7 @@ static XferInterp interpret_xfermode(const SkPaint& paint, SkXfermode* xfer, SkBitmap::Config deviceConfig) { SkXfermode::Mode mode; - if (SkXfermode::IsMode(xfer, &mode)) { + if (SkXfermode::AsMode(xfer, &mode)) { switch (mode) { case SkXfermode::kSrc_Mode: if (just_solid_color(paint)) { diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 579e29a1ac..5ddca08dfe 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -152,7 +152,7 @@ static BitmapXferProc ChooseBitmapXferProc(const SkBitmap& bitmap, } SkXfermode::Mode mode; - if (!SkXfermode::IsMode(paint.getXfermode(), &mode)) { + if (!SkXfermode::AsMode(paint.getXfermode(), &mode)) { return NULL; } diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 69973be928..869189f286 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1462,9 +1462,7 @@ void SkGpuDevice::drawVertices(const SkDraw& draw, SkCanvas::VertexMode vmode, } if (NULL != xmode && NULL != texs && NULL != colors) { - SkXfermode::Mode mode; - if (!SkXfermode::IsMode(xmode, &mode) || - SkXfermode::kMultiply_Mode != mode) { + if (!SkXfermode::IsMode(xmode, SkXfermode::kMultiply_Mode)) { SkDebugf("Unsupported vertex-color/texture xfer mode.\n"); #if 0 return |