diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-10 15:08:45 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-10 15:08:45 +0000 |
| commit | 6c1e49af8de1f6dfdc5fb09cd0edfc2e469e945f (patch) | |
| tree | 22f2556a8b3e1e5840ad88a49c4ac6e2903fc78e | |
| parent | a3d01198594f9a415889c6a15023097c6650066a (diff) | |
Removed deprecated API calls that have crept in
git-svn-id: http://skia.googlecode.com/svn/trunk@12210 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | bench/BlurRoundRectBench.cpp | 3 | ||||
| -rw-r--r-- | gm/blurroundrect.cpp | 8 | ||||
| -rw-r--r-- | src/utils/debugger/SkDebugCanvas.cpp | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/bench/BlurRoundRectBench.cpp b/bench/BlurRoundRectBench.cpp index c57688a142..814e8f474c 100644 --- a/bench/BlurRoundRectBench.cpp +++ b/bench/BlurRoundRectBench.cpp @@ -50,8 +50,9 @@ public: info.fOffset = SkPoint::Make(SkIntToScalar(-1), SkIntToScalar(0)); info.fPostTranslate = false; SkPaint* paint = looper->addLayerOnTop(info); - SkMaskFilter* maskFilter = SkBlurMaskFilter::Create(SK_ScalarHalf, + SkMaskFilter* maskFilter = SkBlurMaskFilter::Create( SkBlurMaskFilter::kNormal_BlurStyle, + SkBlurMask::ConvertRadiusToSigma(SK_ScalarHalf), SkBlurMaskFilter::kHighQuality_BlurFlag); paint->setMaskFilter(maskFilter)->unref(); SkColorFilter* colorFilter = SkColorFilter::CreateModeFilter(SK_ColorLTGRAY, diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp index 33e217eb0a..f5a7d214a4 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -63,8 +63,9 @@ public: info.fOffset = SkPoint::Make(SkIntToScalar(-1), SkIntToScalar(0)); info.fPostTranslate = false; SkPaint* paint = looper->addLayerOnTop(info); - SkMaskFilter* maskFilter = SkBlurMaskFilter::Create(SK_ScalarHalf, + SkMaskFilter* maskFilter = SkBlurMaskFilter::Create( SkBlurMaskFilter::kNormal_BlurStyle, + SkBlurMask::ConvertRadiusToSigma(SK_ScalarHalf), SkBlurMaskFilter::kHighQuality_BlurFlag); paint->setMaskFilter(maskFilter)->unref(); SkColorFilter* colorFilter = SkColorFilter::CreateModeFilter(SK_ColorLTGRAY, @@ -119,8 +120,9 @@ protected: SkAutoCanvasRestore autoRestore(canvas, true); canvas->translate(0, (r.height() + SkIntToScalar(20)) * i); for (size_t j = 0; j < SK_ARRAY_COUNT(cornerRadii); ++j) { - SkMaskFilter* filter = SkBlurMaskFilter::Create(SkIntToScalar(blurRadii[i]), - SkBlurMaskFilter::kNormal_BlurStyle); + SkMaskFilter* filter = SkBlurMaskFilter::Create( + SkBlurMaskFilter::kNormal_BlurStyle, + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(blurRadii[i]))); SkPaint paint; paint.setColor(SK_ColorBLUE); paint.setMaskFilter(filter)->unref(); diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp index 8d35782f85..d1a9f0c925 100644 --- a/src/utils/debugger/SkDebugCanvas.cpp +++ b/src/utils/debugger/SkDebugCanvas.cpp @@ -47,7 +47,7 @@ SkDebugCanvas::SkDebugCanvas(int width, int height) // inset has to be surprisingly large). SkIRect largeIRect = SkIRect::MakeLargest(); largeIRect.inset(1024, 1024); - SkRect large = SkRect::MakeFromIRect(largeIRect); + SkRect large = SkRect::Make(largeIRect); #ifdef SK_DEBUG large.roundOut(&largeIRect); SkASSERT(!largeIRect.isEmpty()); |