luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A few bug fixed in the XOR progress reporter.

This commit is contained in:
Matthias Koefferlein 2017-09-21 22:07:58 +02:00
parent 8cd612ba36
commit cadb9c555a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ext/ext/extXORProgress.cc
View File

@ -34,9 +34,9 @@ namespace ext
static inline void merge (size_t &a, size_t b)
{
if (a == missing_in_a || a == missing_in_a) {
if (a == missing_in_a || a == missing_in_b) {
// leave a
} else if (b == missing_in_a || b == missing_in_a) {
} else if (b == missing_in_a || b == missing_in_b) {
a = b;
} else {
a += b;
@ -66,7 +66,10 @@ static size_t sum (const std::vector<std::vector<size_t> > &b)
size_t n = 0;
for (std::vector<std::vector<size_t> >::const_iterator i = b.begin (); i != b.end (); ++i) {
for (std::vector<size_t>::const_iterator j = i->begin (); j != i->end (); ++j) {
n += *j;
merge (n, *j);
}
if (n == missing_in_a || n == missing_in_b) {
break;
}
}
return n;