diff options
| author | Richard White <rwhite8282@gmail.com> | 2016-05-19 01:17:29 +0000 |
|---|---|---|
| committer | Richard White <rwhite8282@gmail.com> | 2016-05-19 01:17:29 +0000 |
| commit | 1fe9c2603c33fddcd9f2688b30e843f91e1a86fa (patch) | |
| tree | 13289cbe033a46a40eb829437e115b5393e2ca84 /src/unclump.cpp | |
| parent | Corrected frame extension stroke and fill values on 64 bit machine. (diff) | |
| parent | GTK3: Another widget named. (diff) | |
| download | inkscape-1fe9c2603c33fddcd9f2688b30e843f91e1a86fa.tar.gz inkscape-1fe9c2603c33fddcd9f2688b30e843f91e1a86fa.zip | |
Merge from Inkscape trunk.
(bzr r14668.1.3)
Diffstat (limited to 'src/unclump.cpp')
| -rw-r--r-- | src/unclump.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/unclump.cpp b/src/unclump.cpp index 2c6840425..5ec5cfce4 100644 --- a/src/unclump.cpp +++ b/src/unclump.cpp @@ -342,7 +342,9 @@ unclump (std::vector<SPItem*> &items) std::list<SPItem*> nei; std::list<SPItem*> rest; - for(int i=0;i<items.size();i++)rest.push_front(items[items.size()-i-1]); + for (int i=0; i < static_cast<int>(items.size()); i++) { + rest.push_front(items[items.size() - i - 1]); + } rest.remove(item); while (!rest.empty()) { @@ -352,7 +354,9 @@ unclump (std::vector<SPItem*> &items) rest.remove(closest); std::vector<SPItem*> new_rest = unclump_remove_behind (item, closest, rest); rest.clear(); - for(int i=0;i<new_rest.size();i++)rest.push_front(new_rest[new_rest.size()-i-1]); + for (int i=0; i < static_cast<int>(new_rest.size()); i++) { + rest.push_front(new_rest[new_rest.size() - i - 1]); + } } else { break; } |