aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-31 07:01:00 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-31 07:01:00 +0000
commit76015b09536c664bd59b370be7691d4b69553d95 (patch)
tree26b07934ea46abfbbc58343f02c48f36a31d87df
parentdd9875d833cd389528512d0a2e66dc6651ccee51 (diff)
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@10449 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--src/effects/SkBlurMaskFilter.cpp2
-rw-r--r--src/opts/SkBitmapProcState_opts_arm.cpp6
-rwxr-xr-xsrc/ports/SkFontHost_mac.cpp10
3 files changed, 9 insertions, 9 deletions
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index bb7aa4e6d3..b54c33004c 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -345,7 +345,7 @@ void SkBlurMaskFilterImpl::computeFastBounds(const SkRect& src,
{
// raster path
SkScalar radius = SkScalarMul(fRadius, SkBlurMask::kBlurRadiusFudgeFactor);
-
+
radius = (radius + .5f) * 2.f;
rasterPad = SkIntToScalar(SkScalarRoundToInt(radius * 3)/2);
diff --git a/src/opts/SkBitmapProcState_opts_arm.cpp b/src/opts/SkBitmapProcState_opts_arm.cpp
index 2b0b6a2156..a9b44daa89 100644
--- a/src/opts/SkBitmapProcState_opts_arm.cpp
+++ b/src/opts/SkBitmapProcState_opts_arm.cpp
@@ -387,7 +387,7 @@ void convolve4RowsHorizontally_arm(const unsigned char* src_data[4],
/* STOP REWRITING FUNCTIONS HERE, BUT DON'T FORGET TO EDIT THE
PLATFORM CONVOLUTION PROCS BELOW */
-
+
///////////////////////////
void applySIMDPadding_arm(SkConvolutionFilter1D *filter) {
@@ -406,7 +406,7 @@ void SkBitmapProcState::platformConvolutionProcs() {
fConvolutionProcs->fExtraHorizontalReads = 3;
fConvolutionProcs->fConvolveVertically = &convolveVertically_arm;
- // next line is commented out because the four-row convolution function above is
+ // next line is commented out because the four-row convolution function above is
// just a no-op. Please see the comment above its definition, and the SSE implementation
// in SkBitmapProcState_opts_SSE2.cpp for guidance on its semantics.
// leaving it as NULL will just cause the convolution system to not attempt
@@ -417,6 +417,6 @@ void SkBitmapProcState::platformConvolutionProcs() {
fConvolutionProcs->fConvolve4RowsHorizontally = NULL;
fConvolutionProcs->fConvolveHorizontally = &convolveHorizontally_arm;
- fConvolutionProcs->fApplySIMDPadding = &applySIMDPadding_arm;
+ fConvolutionProcs->fApplySIMDPadding = &applySIMDPadding_arm;
}
}
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 52a3fd6930..71fa5ebdb0 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -604,21 +604,21 @@ static SkTypeface* create_typeface(const SkTypeface* familyFace,
if (familyName) {
familyName = map_css_names(familyName);
}
-
+
// Clone an existing typeface
// TODO: only clone if style matches the familyFace's style...
if (familyName == NULL && familyFace != NULL) {
familyFace->ref();
return const_cast<SkTypeface*>(familyFace);
}
-
+
if (!familyName || !*familyName) {
familyName = FONT_DEFAULT_NAME;
}
-
+
NameStyleRec rec = { familyName, style };
SkTypeface* face = SkTypefaceCache::FindByProcAndRef(FindByNameStyle, &rec);
-
+
if (NULL == face) {
face = NewFromName(familyName, style);
if (face) {
@@ -2247,7 +2247,7 @@ protected:
}
return create_from_dataProvider(pr);
}
-
+
virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
unsigned styleBits) SK_OVERRIDE {
return create_typeface(NULL, familyName, (SkTypeface::Style)styleBits);