diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/animator/SkDrawEmboss.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkBlurDrawLooper.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkBlurMask.cpp | 10 | ||||
| -rw-r--r-- | src/effects/SkBlurMask.h | 2 | ||||
| -rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkEmbossMaskFilter.cpp | 2 | ||||
| -rwxr-xr-x | src/ports/SkFontHost_win.cpp | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/animator/SkDrawEmboss.cpp b/src/animator/SkDrawEmboss.cpp index a0084eb2fd..70a2826d3e 100644 --- a/src/animator/SkDrawEmboss.cpp +++ b/src/animator/SkDrawEmboss.cpp @@ -29,6 +29,6 @@ SkDrawEmboss::SkDrawEmboss() : fSigma(-1) { SkMaskFilter* SkDrawEmboss::getMaskFilter() { if (fSigma < 0 || fDirection.count() !=3) return NULL; - return SkBlurMaskFilter::CreateEmboss(fSigma, fDirection.begin(), + return SkBlurMaskFilter::CreateEmboss(fSigma, fDirection.begin(), fAmbient, fSpecular); } diff --git a/src/effects/SkBlurDrawLooper.cpp b/src/effects/SkBlurDrawLooper.cpp index fb0153c2e7..e8407f9f78 100644 --- a/src/effects/SkBlurDrawLooper.cpp +++ b/src/effects/SkBlurDrawLooper.cpp @@ -21,7 +21,7 @@ SkBlurDrawLooper::SkBlurDrawLooper(SkScalar radius, SkScalar dx, SkScalar dy, this->init(SkBlurMask::ConvertRadiusToSigma(radius), dx, dy, color, flags); } -SkBlurDrawLooper::SkBlurDrawLooper(SkColor color, SkScalar sigma, +SkBlurDrawLooper::SkBlurDrawLooper(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy, uint32_t flags) { this->init(sigma, dx, dy, color, flags); } diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp index a8ae1d3133..134fef63c5 100644 --- a/src/effects/SkBlurMask.cpp +++ b/src/effects/SkBlurMask.cpp @@ -486,7 +486,7 @@ void SkMask_FreeImage(uint8_t* image) { bool SkBlurMask::Blur(SkMask* dst, const SkMask& src, SkScalar radius, Style style, Quality quality, SkIPoint* margin) { - return SkBlurMask::BoxBlur(dst, src, + return SkBlurMask::BoxBlur(dst, src, SkBlurMask::ConvertRadiusToSigma(radius), style, quality, margin); } @@ -510,8 +510,8 @@ bool SkBlurMask::BoxBlur(SkMask* dst, const SkMask& src, // 6*rad+1 while the full Gaussian width is 6*sigma. passRadius = sigma - (1/6.0f); } else { - // For the low quality path we only attempt to cover 3*sigma of the - // Gaussian blur area (1.5*sigma on each side). The single pass box + // For the low quality path we only attempt to cover 3*sigma of the + // Gaussian blur area (1.5*sigma on each side). The single pass box // blur's kernel size is 2*rad+1. passRadius = 1.5f*sigma - 0.5f; } @@ -729,11 +729,11 @@ bool SkBlurMask::BlurRect(SkMask *dst, const SkRect &src, SkScalar radius, Style style, SkIPoint *margin, SkMask::CreateMode createMode) { return SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(radius), - dst, src, + dst, src, style, margin, createMode); } -bool SkBlurMask::BlurRect(SkScalar sigma, SkMask *dst, +bool SkBlurMask::BlurRect(SkScalar sigma, SkMask *dst, const SkRect &src, Style style, SkIPoint *margin, SkMask::CreateMode createMode) { int profile_size = SkScalarCeilToInt(6*sigma); diff --git a/src/effects/SkBlurMask.h b/src/effects/SkBlurMask.h index f49cd129df..061cfdec52 100644 --- a/src/effects/SkBlurMask.h +++ b/src/effects/SkBlurMask.h @@ -48,7 +48,7 @@ public: static bool BlurRect(SkMask *dst, const SkRect &src, SkScalar radius, Style style, SkIPoint *margin = NULL, - SkMask::CreateMode createMode = + SkMask::CreateMode createMode = SkMask::kComputeBoundsAndRenderImage_CreateMode); // DEPRECATED - radius-based static bool Blur(SkMask* dst, const SkMask& src, diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 88333582a6..c51acce391 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -334,7 +334,7 @@ SkBlurMaskFilterImpl::SkBlurMaskFilterImpl(SkFlattenableReadBuffer& buffer) fSigma = buffer.readScalar(); #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO // Fixing this must be done in two stages. When the skps are recaptured in V13, - // remove the ConvertRadiusToSigma but retain the absolute value. + // remove the ConvertRadiusToSigma but retain the absolute value. // At the same time, switch the code in flatten to write a positive value. // When the skps are captured in V14 the absolute value can be removed. if (fSigma > 0) { diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp index 7abe796ec7..31beb511d5 100644 --- a/src/effects/SkEmbossMaskFilter.cpp +++ b/src/effects/SkEmbossMaskFilter.cpp @@ -137,7 +137,7 @@ SkEmbossMaskFilter::SkEmbossMaskFilter(SkFlattenableReadBuffer& buffer) fBlurSigma = buffer.readScalar(); #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO // Fixing this must be done in two stages. When the skps are recaptured in V13, - // remove the ConvertRadiusToSigma but retain the absolute value. + // remove the ConvertRadiusToSigma but retain the absolute value. // At the same time, switch the code in flatten to write a positive value. // When the skps are captured in V14 the absolute value can be removed. if (fBlurSigma > 0) { diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 56dbca6fbd..7ba14aac4f 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -818,7 +818,7 @@ uint16_t SkScalerContext_GDI::generateCharToGlyph(SkUnichar utf32) { // TODO(ctguil): Support characters that generate more than one glyph. if (SkUTF16_FromUnichar(utf32, (uint16_t*)utf16) == 1) { // Type1 fonts fail with uniscribe API. Use GetGlyphIndices for plane 0. - + /** Real documentation for GetGlyphIndiciesW: * * When GGI_MARK_NONEXISTING_GLYPHS is not specified and a character does not map to a |