aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-03-12 03:02:18 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-03-12 03:02:18 +0000
commit0b70816eb157ed6492623eea1e55005ef40c908c (patch)
treedad28cbc7ba2b2aeac134b6f568d0bb3b312dcb8 /src/core
parent4fcd92d0bf09dc9c28643e83b95b6cbf9f1ff2b2 (diff)
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13755 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
-rwxr-xr-xsrc/core/SkDistanceFieldGen.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkDistanceFieldGen.cpp b/src/core/SkDistanceFieldGen.cpp
index 8370e0239c..cd469a4d95 100755
--- a/src/core/SkDistanceFieldGen.cpp
+++ b/src/core/SkDistanceFieldGen.cpp
@@ -32,7 +32,7 @@ static bool found_edge(const unsigned char* imagePtr, int width) {
}
static void init_glyph_data(DFData* data, unsigned char* edges, const unsigned char* image,
- int dataWidth, int dataHeight,
+ int dataWidth, int dataHeight,
int imageWidth, int imageHeight,
int pad) {
data += pad*dataWidth;
@@ -118,11 +118,11 @@ static void init_distances(DFData* data, unsigned char* edges, int width, int he
// if you're inside, gradient points away from edge
SkPoint currGrad;
currGrad.fX = (prevData+1)->fAlpha - (prevData-1)->fAlpha
- + SK_ScalarSqrt2*(currData+1)->fAlpha
+ + SK_ScalarSqrt2*(currData+1)->fAlpha
- SK_ScalarSqrt2*(currData-1)->fAlpha
+ (nextData+1)->fAlpha - (nextData-1)->fAlpha;
- currGrad.fY = (nextData-1)->fAlpha - (prevData-1)->fAlpha
- + SK_ScalarSqrt2*nextData->fAlpha
+ currGrad.fY = (nextData-1)->fAlpha - (prevData-1)->fAlpha
+ + SK_ScalarSqrt2*nextData->fAlpha
- SK_ScalarSqrt2*prevData->fAlpha
+ (nextData+1)->fAlpha - (prevData+1)->fAlpha;
currGrad.setLengthFast(1.0f);
@@ -287,7 +287,7 @@ bool SkGenerateDistanceFieldFromImage(unsigned char* distanceField,
SkASSERT(NULL != image);
// the final distance field will have additional texels on each side to handle
- // the maximum distance
+ // the maximum distance
// we expand our temp data by one more on each side to simplify
// the scanning code -- will always be treated as infinitely far away
int pad = distanceMagnitude+1;