Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
d7789746
Commit
d7789746
authored
Jul 12, 2017
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nxcompshad/src/Core.cpp: Don't redeclare (and shadow) curLine. Use curWorkLine instead.
parent
dba85007
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
21 deletions
+21
-21
Core.cpp
nxcompshad/src/Core.cpp
+21
-21
No files found.
nxcompshad/src/Core.cpp
View file @
d7789746
...
...
@@ -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
,
cur
Work
Line
,
left
,
right
;
for
(
cur
Line
=
0
;
curLine
<
(
int
)
height_
;
cur
Line
++
)
for
(
cur
WorkLine
=
0
;
curWorkLine
<
(
int
)
height_
;
curWork
Line
++
)
{
if
(
lineStatus_
[
curLine
]
==
LINE_HAS_CHANGED
)
if
(
lineStatus_
[
cur
Work
Line
]
==
LINE_HAS_CHANGED
)
{
break
;
}
}
start
=
curLine
;
last
=
curLine
;
start
=
cur
Work
Line
;
last
=
cur
Work
Line
;
left
=
lefts_
[
curLine
];
right
=
rights_
[
curLine
];
curLine
++
;
left
=
lefts_
[
cur
Work
Line
];
right
=
rights_
[
cur
Work
Line
];
cur
Work
Line
++
;
while
(
1
)
{
for
(;
cur
Line
<
(
int
)
height_
;
cur
Line
++
)
for
(;
cur
WorkLine
<
(
int
)
height_
;
curWork
Line
++
)
{
if
(
lineStatus_
[
curLine
]
==
LINE_HAS_CHANGED
)
if
(
lineStatus_
[
cur
Work
Line
]
==
LINE_HAS_CHANGED
)
{
break
;
}
}
if
(
curLine
==
(
int
)
height_
)
if
(
cur
Work
Line
==
(
int
)
height_
)
{
break
;
}
if
((
curLine
-
last
>
minSliceHeight_
)
||
(
last
-
start
>
maxSliceHeight_
))
if
((
cur
Work
Line
-
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
=
cur
Work
Line
;
left
=
lefts_
[
cur
Work
Line
];
right
=
rights_
[
cur
Work
Line
];
}
else
{
if
(
lefts_
[
curLine
]
<
left
)
if
(
lefts_
[
cur
Work
Line
]
<
left
)
{
left
=
lefts_
[
curLine
];
left
=
lefts_
[
cur
Work
Line
];
}
if
(
rights_
[
curLine
]
>
right
)
if
(
rights_
[
cur
Work
Line
]
>
right
)
{
right
=
rights_
[
curLine
];
right
=
rights_
[
cur
Work
Line
];
}
}
last
=
curLine
;
last
=
cur
Work
Line
;
curLine
++
;
cur
Work
Line
++
;
}
//
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment