aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkRegion_rects.cpp
diff options
context:
space:
mode:
authorGravatar rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-23 18:09:54 +0000
committerGravatar rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-23 18:09:54 +0000
commitfbfcd5602128ec010c82cb733c9cdc0a3254f9f3 (patch)
treed8b4815d15946c32ee9d254e932411e93be942bb /src/core/SkRegion_rects.cpp
parent2abed834789bb64c7da740df4c47efc142b7311a (diff)
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part I of IV (I broke down the 1280 files into 4 CLs). Review URL: https://codereview.appspot.com/6485054 git-svn-id: http://skia.googlecode.com/svn/trunk@5262 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkRegion_rects.cpp')
-rw-r--r--src/core/SkRegion_rects.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/core/SkRegion_rects.cpp b/src/core/SkRegion_rects.cpp
index 1777a1e16f..4121080c41 100644
--- a/src/core/SkRegion_rects.cpp
+++ b/src/core/SkRegion_rects.cpp
@@ -15,12 +15,12 @@
struct VEdge {
VEdge* fPrev;
VEdge* fNext;
-
+
SkRegion::RunType fX;
SkRegion::RunType fTop;
SkRegion::RunType fBottom;
int fWinding;
-
+
void removeFromList() {
fPrev->fNext = fNext;
fNext->fPrev = fPrev;
@@ -34,7 +34,7 @@ struct VEdge {
// remove prev from the list
prev->fPrev->fNext = next;
next->fPrev = prev->fPrev;
-
+
// insert prev after next
prev->fNext = next->fNext;
next->fNext->fPrev = prev;
@@ -48,7 +48,7 @@ struct VEdge {
edges[0].fTop = r.fTop;
edges[0].fBottom = r.fBottom;
edges[0].fWinding = -1;
-
+
edges[1].fX = r.fRight;
edges[1].fTop = r.fTop;
edges[1].fBottom = r.fBottom;
@@ -60,12 +60,12 @@ class Accumulator {
public:
Accumulator(SkRegion::RunType top, int numRects);
~Accumulator() {}
-
+
SkRegion::RunType append(SkRegion::RunType top, const VEdge* edge);
-
+
int count() const { return fTotalCount; }
void copyTo(SkRegion::RunType dst[]);
-
+
private:
struct Row {
SkRegion::RunType* fPtr;
@@ -94,7 +94,7 @@ SkRegion::RunType Accumulator::append(SkRegion::RunType currY, const VEdge* edge
size_t size = fRectCount * 2 * sizeof(SkRegion::RunType);
SkRegion::RunType* row = (SkRegion::RunType*)fAlloc.allocThrow(size);
SkRegion::RunType* rowHead = row;
-
+
SkRegion::RunType nextY = SkRegion::kRunTypeSentinel;
int winding = edge->fWinding;
@@ -123,7 +123,7 @@ SkRegion::RunType Accumulator::append(SkRegion::RunType currY, const VEdge* edge
*row++ = edge->fX;
TRACE_ROW(SkDebugf(" %d] [%d", currR, edge->fX);)
}
-
+
nextY = SkMin32(nextY, edge->fBottom);
edge = edge->fNext;
}
@@ -132,7 +132,7 @@ SkRegion::RunType Accumulator::append(SkRegion::RunType currY, const VEdge* edge
TRACE_ROW(SkDebugf(" %d]\n", currR);)
}
int rowCount = row - rowHead;
-
+
// now see if we have already seen this row, or if its unique
Row* r = fRows.count() ? &fRows[fRows.count() - 1] : NULL;
@@ -148,15 +148,15 @@ SkRegion::RunType Accumulator::append(SkRegion::RunType currY, const VEdge* edge
r->fCount = rowCount;
fTotalCount += 1 + rowCount + 1;
}
-
+
return nextY;
}
void Accumulator::copyTo(SkRegion::RunType dst[]) {
SkDEBUGCODE(SkRegion::RunType* startDst = dst;)
-
+
*dst++ = fTop;
-
+
const Row* curr = fRows.begin();
const Row* stop = fRows.end();
while (curr < stop) {
@@ -207,7 +207,7 @@ static VEdge* sort_edges(VEdge** edgePtr, VEdge edge[], const SkIRect rects[],
*ptr++ = edge++;
}
}
-
+
int edgeCount = ptr - edgePtr;
if (0 == edgeCount) {
// all the rects[] were empty
@@ -251,7 +251,7 @@ bool SkRegion::setRects(const SkIRect rects[], int rectCount) {
headEdge.fTop = SK_MinS32;
headEdge.fX = SK_MinS32;
head->fPrev = &headEdge;
-
+
tailEdge.fPrev = tail;
tailEdge.fNext = NULL;
tailEdge.fTop = SK_MaxS32;
@@ -259,7 +259,7 @@ bool SkRegion::setRects(const SkIRect rects[], int rectCount) {
int32_t currY = head->fTop;
Accumulator accum(currY, rectCount);
-
+
while (head->fNext) {
VEdge* edge = head;
// accumulate the current