cppcheck: further fixes

This commit is contained in:
Ingo Weyrich
2019-07-31 20:02:35 +02:00
parent 0ed517d972
commit 4101102ddf
18 changed files with 62 additions and 189 deletions

View File

@@ -405,7 +405,6 @@ public:
// Get the value as a double
virtual double toDouble (const Tag* t, int ofs = 0)
{
double ud, dd;
switch (t->getType()) {
case SBYTE:
@@ -428,10 +427,11 @@ public:
return (double) ((int)sget4 (t->getValue() + ofs, t->getOrder()));
case SRATIONAL:
case RATIONAL:
ud = (int)sget4 (t->getValue() + ofs, t->getOrder());
dd = (int)sget4 (t->getValue() + ofs + 4, t->getOrder());
return dd == 0. ? 0. : (double)ud / (double)dd;
case RATIONAL: {
const double dividend = (int)sget4 (t->getValue() + ofs, t->getOrder());
const double divisor = (int)sget4 (t->getValue() + ofs + 4, t->getOrder());
return divisor == 0. ? 0. : dividend / divisor;
}
case FLOAT:
return double (sget4 (t->getValue() + ofs, t->getOrder()));