AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix issue 99 -- unneeded assignment inside find_y

Browse Source 
move find_y to right above its only caller (Spanerator)
reformat Spanerator methods to match coding style



git-svn-id: http://skia.googlecode.com/svn/trunk@678 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2011-01-07 15:00:44 +00:00
parent 2fbc7fa460
commit e72766fe02
1 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/core/SkRegion.cpp
View File

@ -35,27 +35,6 @@ static SkRegion::RunType* skip_scanline(const SkRegion::RunType runs[])
return (SkRegion::RunType*)(runs + 1); // return past the X-sentinel return (SkRegion::RunType*)(runs + 1); // return past the X-sentinel
} }
static SkRegion::RunType* find_y(const SkRegion::RunType runs[], int y)
{
int top = *runs++;
if (top <= y)
{
for (;;)
{
int bot = *runs++;
if (bot > y)
{
if (bot == SkRegion::kRunTypeSentinel || *runs == SkRegion::kRunTypeSentinel)
break;
return (SkRegion::RunType*)runs;
}
top = bot;
runs = skip_scanline(runs);
}
}
return NULL;
}
// returns true if runs are just a rect // returns true if runs are just a rect
bool SkRegion::ComputeRunBounds(const SkRegion::RunType runs[], int count, SkIRect* bounds) bool SkRegion::ComputeRunBounds(const SkRegion::RunType runs[], int count, SkIRect* bounds)
{ {
@ -1264,40 +1243,57 @@ void SkRegion::Cliperator::next() {
} }
} }
////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
SkRegion::Spanerator::Spanerator(const SkRegion& rgn, int y, int left, int right) static SkRegion::RunType* find_y(const SkRegion::RunType runs[], int y) {
{ int top = *runs++;
if (top <= y) {
for (;;) {
int bot = *runs++;
if (bot > y) {
if (bot == SkRegion::kRunTypeSentinel ||
*runs == SkRegion::kRunTypeSentinel) {
break;
}
return (SkRegion::RunType*)runs;
}
runs = skip_scanline(runs);
}
}
return NULL;
}
SkRegion::Spanerator::Spanerator(const SkRegion& rgn, int y, int left,
int right) {
SkDEBUGCODE(rgn.validate();) SkDEBUGCODE(rgn.validate();)
const SkIRect& r = rgn.getBounds(); const SkIRect& r = rgn.getBounds();
fDone = true; fDone = true;
if (!rgn.isEmpty() && y >= r.fTop && y < r.fBottom && right > r.fLeft && left < r.fRight) if (!rgn.isEmpty() && y >= r.fTop && y < r.fBottom &&
{ right > r.fLeft && left < r.fRight) {
if (rgn.isRect()) if (rgn.isRect()) {
{ if (left < r.fLeft) {
if (left < r.fLeft)
left = r.fLeft; left = r.fLeft;
if (right > r.fRight) }
if (right > r.fRight) {
right = r.fRight; right = r.fRight;
}
fLeft = left; fLeft = left;
fRight = right; fRight = right;
fRuns = NULL; // means we're a rect, not a rgn fRuns = NULL; // means we're a rect, not a rgn
fDone = false; fDone = false;
} } else {
else const SkRegion::RunType* runs = find_y(
{ rgn.fRunHead->readonly_runs(), y);
const SkRegion::RunType* runs = find_y(rgn.fRunHead->readonly_runs(), y); if (runs) {
if (runs) for (;;) {
{ // runs[0..1] is to the right of the span, so we're done
for (;;) if (runs[0] >= right) {
{
if (runs[0] >= right) // runs[0..1] is to the right of the span, so we're done
break; break;
if (runs[1] <= left) // runs[0..1] is to the left of the span, so continue }
{ // runs[0..1] is to the left of the span, so continue
if (runs[1] <= left) {
runs += 2; runs += 2;
continue; continue;
} }
@ -1313,32 +1309,37 @@ SkRegion::Spanerator::Spanerator(const SkRegion& rgn, int y, int left, int right
} }
} }
bool SkRegion::Spanerator::next(int* left, int* right) bool SkRegion::Spanerator::next(int* left, int* right) {
{ if (fDone) {
if (fDone) return false; return false;
}
if (fRuns == NULL) // we're a rect if (fRuns == NULL) { // we're a rect
{
fDone = true; // ok, now we're done fDone = true; // ok, now we're done
if (left) *left = fLeft; if (left) {
if (right) *right = fRight; *left = fLeft;
}
if (right) {
*right = fRight;
}
return true; // this interval is legal return true; // this interval is legal
} }
const SkRegion::RunType* runs = fRuns; const SkRegion::RunType* runs = fRuns;
if (runs[0] >= fRight) if (runs[0] >= fRight) {
{
fDone = true; fDone = true;
return false; return false;
} }
SkASSERT(runs[1] > fLeft); SkASSERT(runs[1] > fLeft);
if (left) if (left) {
*left = SkMax32(fLeft, runs[0]); *left = SkMax32(fLeft, runs[0]);
if (right) }
if (right) {
*right = SkMin32(fRight, runs[1]); *right = SkMin32(fRight, runs[1]);
}
fRuns = runs + 2; fRuns = runs + 2;
return true; return true;
} }