diff options
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkBitmapAlphaThresholdShader.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkBlurMask.h | 8 | ||||
| -rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 2 | ||||
| -rwxr-xr-x | src/effects/SkTestImageFilters.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkTransparentShader.cpp | 6 |
6 files changed, 12 insertions, 10 deletions
diff --git a/src/effects/SkBitmapAlphaThresholdShader.cpp b/src/effects/SkBitmapAlphaThresholdShader.cpp index 1b54425548..226b3173e1 100644 --- a/src/effects/SkBitmapAlphaThresholdShader.cpp +++ b/src/effects/SkBitmapAlphaThresholdShader.cpp @@ -249,7 +249,7 @@ GrEffectRef* BATShader::asNewEffect(GrContext* context, const SkPaint& paint) co context->setMatrix(matrix); while (!iter.done()) { - SkRect rect = SkRect::MakeFromIRect(iter.rect()); + SkRect rect = SkRect::Make(iter.rect()); context->drawRect(grPaint, rect); iter.next(); } diff --git a/src/effects/SkBlurMask.h b/src/effects/SkBlurMask.h index 061cfdec52..e0b8d54ce1 100644 --- a/src/effects/SkBlurMask.h +++ b/src/effects/SkBlurMask.h @@ -44,17 +44,19 @@ public: Style style, SkIPoint* margin = NULL); - // DEPRECATED - radius-based + SK_ATTR_DEPRECATED("use sigma version") static bool BlurRect(SkMask *dst, const SkRect &src, SkScalar radius, Style style, SkIPoint *margin = NULL, SkMask::CreateMode createMode = SkMask::kComputeBoundsAndRenderImage_CreateMode); - // DEPRECATED - radius-based + + SK_ATTR_DEPRECATED("use sigma version") static bool Blur(SkMask* dst, const SkMask& src, SkScalar radius, Style style, Quality quality, SkIPoint* margin = NULL); - // DEPRECATED - radius-based + + SK_ATTR_DEPRECATED("use sigma version") static bool BlurGroundTruth(SkMask* dst, const SkMask& src, SkScalar radius, Style style, SkIPoint* margin = NULL); diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 6a5a39778c..5b72a6c800 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -386,7 +386,7 @@ bool SkBlurMaskFilterImpl::canFilterMaskGPU(const SkRect& srcBounds, float sigma3 = 3 * SkScalarToFloat(xformedSigma); - SkRect clipRect = SkRect::MakeFromIRect(clipBounds); + SkRect clipRect = SkRect::Make(clipBounds); SkRect srcRect(srcBounds); // Outset srcRect and clipRect by 3 * sigma, to compute affected blur area. diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 52c01fe0d6..152ec560bd 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -501,7 +501,7 @@ void apply_morphology_pass(GrContext* context, direction, radius, morphType))->unref(); - context->drawRectToRect(paint, SkRect::MakeFromIRect(dstRect), SkRect::MakeFromIRect(srcRect)); + context->drawRectToRect(paint, SkRect::Make(dstRect), SkRect::Make(srcRect)); } bool apply_morphology(const SkBitmap& input, diff --git a/src/effects/SkTestImageFilters.cpp b/src/effects/SkTestImageFilters.cpp index d0e21a3920..289113133c 100755 --- a/src/effects/SkTestImageFilters.cpp +++ b/src/effects/SkTestImageFilters.cpp @@ -48,7 +48,7 @@ bool SkDownSampleImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src, OwnDeviceCanvas canvas(dev); SkPaint paint; - paint.setFilterBitmap(true); + paint.setFilterLevel(SkPaint::kLow_FilterLevel); canvas.scale(scale, scale); canvas.drawBitmap(src, 0, 0, &paint); tmp = dev->accessBitmap(false); diff --git a/src/effects/SkTransparentShader.cpp b/src/effects/SkTransparentShader.cpp index 0274481623..970e74faa8 100644 --- a/src/effects/SkTransparentShader.cpp +++ b/src/effects/SkTransparentShader.cpp @@ -23,7 +23,7 @@ bool SkTransparentShader::setContext(const SkBitmap& device, uint32_t SkTransparentShader::getFlags() { uint32_t flags = this->INHERITED::getFlags(); - switch (fDevice->getConfig()) { + switch (fDevice->config()) { case SkBitmap::kRGB_565_Config: flags |= kHasSpan16_Flag; if (fAlpha == 255) @@ -42,7 +42,7 @@ uint32_t SkTransparentShader::getFlags() { void SkTransparentShader::shadeSpan(int x, int y, SkPMColor span[], int count) { unsigned scale = SkAlpha255To256(fAlpha); - switch (fDevice->getConfig()) { + switch (fDevice->config()) { case SkBitmap::kARGB_8888_Config: if (scale == 256) { SkPMColor* src = fDevice->getAddr32(x, y); @@ -103,7 +103,7 @@ void SkTransparentShader::shadeSpan(int x, int y, SkPMColor span[], int count) { } void SkTransparentShader::shadeSpan16(int x, int y, uint16_t span[], int count) { - SkASSERT(fDevice->getConfig() == SkBitmap::kRGB_565_Config); + SkASSERT(fDevice->config() == SkBitmap::kRGB_565_Config); uint16_t* src = fDevice->getAddr16(x, y); if (src != span) { |