projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix assertion failure when processors return fewer channels than the DCP has.
[dcpomatic.git]
/
src
/
lib
/
ratio.cc
diff --git
a/src/lib/ratio.cc
b/src/lib/ratio.cc
index 6edd154e04030ea1142ccdbff86e107a98261d79..a6ebad14117542443e3fd704b35ca7cacdfbebd3 100644
(file)
--- a/
src/lib/ratio.cc
+++ b/
src/lib/ratio.cc
@@
-49,7
+49,7
@@
Ratio::from_id (string i)
if (i == "137") {
i = "138";
}
if (i == "137") {
i = "138";
}
-
+
vector<Ratio const *>::iterator j = _ratios.begin ();
while (j != _ratios.end() && (*j)->id() != i) {
++j;
vector<Ratio const *>::iterator j = _ratios.begin ();
while (j != _ratios.end() && (*j)->id() != i) {
++j;
@@
-77,13
+77,13
@@
Ratio::from_ratio (float r)
return *j;
}
return *j;
}
-
+
Ratio const *
Ratio::nearest_from_ratio (float r)
{
Ratio const * nearest = 0;
float distance = FLT_MAX;
Ratio const *
Ratio::nearest_from_ratio (float r)
{
Ratio const * nearest = 0;
float distance = FLT_MAX;
-
+
for (vector<Ratio const *>::iterator i = _ratios.begin (); i != _ratios.end(); ++i) {
float const d = fabs ((*i)->ratio() - r);
if (d < distance) {
for (vector<Ratio const *>::iterator i = _ratios.begin (); i != _ratios.end(); ++i) {
float const d = fabs ((*i)->ratio() - r);
if (d < distance) {