liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix coverity issues

Browse Source
This commit is contained in:
heckflosse 2018-11-20 21:23:37 +01:00
parent a19f3484dd
commit e7a04bb77e
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rtgui/thumbbrowserbase.cc
View File

@ -166,33 +166,37 @@ void ThumbBrowserBase::selectSingle (ThumbBrowserEntryBase* clicked)
void ThumbBrowserBase::selectRange (ThumbBrowserEntryBase* clicked, bool additional) void ThumbBrowserBase::selectRange (ThumbBrowserEntryBase* clicked, bool additional)
{ {
if (selected.empty ()) { if (selected.empty()) {
addToSelection (clicked, selected); addToSelection(clicked, selected);
return; return;
} }
if (!additional || !lastClicked) { if (!additional || !lastClicked) {
// Extend the current range w.r.t to first selected entry. // Extend the current range w.r.t to first selected entry.
ThumbIterator front = std::find (fd.begin (), fd.end (), selected.front ()); ThumbIterator front = std::find(fd.begin(), fd.end(), selected.front());
ThumbIterator current = std::find (fd.begin (), fd.end (), clicked); ThumbIterator current = std::find(fd.begin(), fd.end(), clicked);
if (front > current) if (front > current) {
std::swap (front, current); std::swap(front, current);
}
clearSelection (selected); clearSelection(selected);
for (; front <= current; ++front) for (; front <= current && front != fd.end(); ++front) {
addToSelection (*front, selected); addToSelection(*front, selected);
}
} else { } else {
// Add an additional range w.r.t. the last clicked entry. // Add an additional range w.r.t. the last clicked entry.
ThumbIterator last = std::find (fd.begin (), fd.end (), lastClicked); ThumbIterator last = std::find(fd.begin(), fd.end(), lastClicked);
ThumbIterator current = std::find (fd.begin (), fd.end (), clicked); ThumbIterator current = std::find (fd.begin(), fd.end(), clicked);
if (last > current) if (last > current) {
std::swap (last, current); std::swap(last, current);
}
for (; last <= current; ++last) for (; last <= current && last != fd.end(); ++last) {
addToSelection (*last, selected); addToSelection(*last, selected);
}
} }
} }
@ -337,7 +341,7 @@ void ThumbBrowserBase::selectNext (int distance, bool enlarge)
std::swap(front, back); std::swap(front, back);
} }
for (; front <= back; ++front) { for (; front <= back && front != fd.end(); ++front) {
if (!(*front)->filtered) { if (!(*front)->filtered) {
(*front)->selected = true; (*front)->selected = true;
redrawNeeded (*front); redrawNeeded (*front);