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

Consider integers only (#2467)

Browse Source
This commit is contained in:
Flössie
2018-05-18 20:00:40 +02:00
parent 70eefd049b
commit 579aae510c
1 changed files with 3 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
rtgui/thumbbrowserentrybase.cc
View File

@@ -30,8 +30,7 @@ Glib::ustring getPaddedName(const Glib::ustring& name)
{ {
enum class State { enum class State {
OTHER, OTHER,
NUMBER, NUMBER
FRACTION
}; };
constexpr unsigned int pad_width = 16; constexpr unsigned int pad_width = 16;
@@ -56,13 +55,8 @@ Glib::ustring getPaddedName(const Glib::ustring& name)
case '8': case '8':
case '9': { case '9': {
number += c; number += c;
state = State::NUMBER;
break;
}
case '.': { state = State::NUMBER;
res += c;
state = State::FRACTION;
break; break;
} }
@@ -98,43 +92,7 @@ Glib::ustring getPaddedName(const Glib::ustring& name)
res += c; res += c;
number.clear(); number.clear();
state = state = State::OTHER;
c == '.'
? State::FRACTION
: State::OTHER;
break;
}
}
break;
}
case State::FRACTION: {
switch (c) {
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9': {
number += c;
break;
}
default: {
res += number;
if (!number.empty() && number.size() < pad_width) {
res.append(pad_width - number.size(), '0');
}
res += c;
number.clear();
if (c != '.') {
state = State::OTHER;
}
break; break;
} }
} }
@@ -155,14 +113,6 @@ Glib::ustring getPaddedName(const Glib::ustring& name)
res += number; res += number;
break; break;
} }
case State::FRACTION: {
res += number;
if (!number.empty() && number.size() < pad_width) {
res.append(pad_width - number.size(), '0');
}
break;
}
} }
return res; return res;