aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-12 22:23:07 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-13 11:38:42 +0200
commitd7789746285f1d4c1bd7763058aff3a31e250b23 (patch)
tree3399aea37a30dc71203ed059f8635da6c8f28de5
parentdba850070044697a84f1baaad8ad274cc7601cb3 (diff)
downloadnx-libs-d7789746285f1d4c1bd7763058aff3a31e250b23.tar.gz
nx-libs-d7789746285f1d4c1bd7763058aff3a31e250b23.tar.bz2
nx-libs-d7789746285f1d4c1bd7763058aff3a31e250b23.zip
nxcompshad/src/Core.cpp: Don't redeclare (and shadow) curLine. Use curWorkLine instead.
-rw-r--r--nxcompshad/src/Core.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/nxcompshad/src/Core.cpp b/nxcompshad/src/Core.cpp
index de5f9a897..2b2163ea1 100644
--- a/nxcompshad/src/Core.cpp
+++ b/nxcompshad/src/Core.cpp
@@ -421,64 +421,64 @@ int CorePoller::isChanged(int (*checkIfInputCallback)(void *), void *arg, int *s
if (foundChanges)
{
- int start, last, curLine, left, right;
+ int start, last, curWorkLine, left, right;
- for (curLine = 0; curLine < (int) height_; curLine++)
+ for (curWorkLine = 0; curWorkLine < (int) height_; curWorkLine++)
{
- if (lineStatus_[curLine] == LINE_HAS_CHANGED)
+ if (lineStatus_[curWorkLine] == LINE_HAS_CHANGED)
{
break;
}
}
- start = curLine;
- last = curLine;
+ start = curWorkLine;
+ last = curWorkLine;
- left = lefts_[curLine];
- right = rights_[curLine];
- curLine++;
+ left = lefts_[curWorkLine];
+ right = rights_[curWorkLine];
+ curWorkLine++;
while (1)
{
- for (; curLine < (int) height_; curLine++)
+ for (; curWorkLine < (int) height_; curWorkLine++)
{
- if (lineStatus_[curLine] == LINE_HAS_CHANGED)
+ if (lineStatus_[curWorkLine] == LINE_HAS_CHANGED)
{
break;
}
}
- if (curLine == (int) height_)
+ if (curWorkLine == (int) height_)
{
break;
}
- if ((curLine - last > minSliceHeight_) || (last - start > maxSliceHeight_))
+ if ((curWorkLine - last > minSliceHeight_) || (last - start > maxSliceHeight_))
{
XRectangle rect = {left, start, right - left + 1, last - start + 1};
XUnionRectWithRegion(&rect, lastUpdatedRegion_, lastUpdatedRegion_);
- start = curLine;
- left = lefts_[curLine];
- right = rights_[curLine];
+ start = curWorkLine;
+ left = lefts_[curWorkLine];
+ right = rights_[curWorkLine];
}
else
{
- if (lefts_[curLine] < left)
+ if (lefts_[curWorkLine] < left)
{
- left = lefts_[curLine];
+ left = lefts_[curWorkLine];
}
- if (rights_[curLine] > right)
+ if (rights_[curWorkLine] > right)
{
- right = rights_[curLine];
+ right = rights_[curWorkLine];
}
}
- last = curLine;
+ last = curWorkLine;
- curLine++;
+ curWorkLine++;
}
//