aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/gpu/GrRectanizer_skyline.cpp9
-rw-r--r--src/pathops/SkDQuadIntersection.cpp2
-rw-r--r--src/pathops/SkPathOpsDebug.cpp1
3 files changed, 5 insertions, 7 deletions
diff --git a/src/gpu/GrRectanizer_skyline.cpp b/src/gpu/GrRectanizer_skyline.cpp
index 96de2d05fd..a55451a896 100755
--- a/src/gpu/GrRectanizer_skyline.cpp
+++ b/src/gpu/GrRectanizer_skyline.cpp
@@ -104,13 +104,13 @@ bool GrRectanizerSkyline::rectangleFits(int skylineIndex, int width, int height,
int i = skylineIndex;
int y = fSkyline[skylineIndex].fY;
while (widthLeft > 0) {
- y = SkMax32(y, fSkyline[i].fY);
+ y = SkMax32(y, fSkyline[i].fY);
if (y + height > this->height()) {
return false;
}
- widthLeft -= fSkyline[i].fWidth;
- ++i;
- SkASSERT(i < fSkyline.count() || widthLeft <= 0);
+ widthLeft -= fSkyline[i].fWidth;
+ ++i;
+ SkASSERT(i < fSkyline.count() || widthLeft <= 0);
}
*ypos = y;
@@ -163,4 +163,3 @@ void GrRectanizerSkyline::addSkylineLevel(int skylineIndex, int x, int y, int wi
GrRectanizer* GrRectanizer::Factory(int width, int height) {
return SkNEW_ARGS(GrRectanizerSkyline, (width, height));
}
-
diff --git a/src/pathops/SkDQuadIntersection.cpp b/src/pathops/SkDQuadIntersection.cpp
index 71ebf9abc0..6e5f3e6012 100644
--- a/src/pathops/SkDQuadIntersection.cpp
+++ b/src/pathops/SkDQuadIntersection.cpp
@@ -250,7 +250,7 @@ static bool is_linear(const SkDQuad& q1, const SkDQuad& q2, SkIntersections* i)
// FIXME: if flat measure is sufficiently large, then probably the quartic solution failed
// avoid imprecision incurred with chopAt
-static void relaxed_is_linear(const SkDQuad* q1, double s1, double e1, const SkDQuad* q2,
+static void relaxed_is_linear(const SkDQuad* q1, double s1, double e1, const SkDQuad* q2,
double s2, double e2, SkIntersections* i) {
double m1 = flat_measure(*q1);
double m2 = flat_measure(*q2);
diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp
index e52e47beb2..1b19fe5ce1 100644
--- a/src/pathops/SkPathOpsDebug.cpp
+++ b/src/pathops/SkPathOpsDebug.cpp
@@ -157,4 +157,3 @@ void Dump(const SkTArray<class SkOpAngle* , true>* angles) {
}
#endif
-