aboutsummaryrefslogtreecommitdiffstats
path: root/utils/makemhr/loaddef.cpp
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-09-11 04:55:54 -0700
committerChris Robinson <[email protected]>2019-09-11 04:55:54 -0700
commite4b15aeefcc220a46542c4bb2a2cea033e7954f0 (patch)
tree7f21188acc82ae007dea24e9f3a333e8feb4e1ae /utils/makemhr/loaddef.cpp
parent5b37e2339bc91de3424b51600c3d3b96401d0b9c (diff)
Fix some implicit casts
Diffstat (limited to 'utils/makemhr/loaddef.cpp')
-rw-r--r--utils/makemhr/loaddef.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/utils/makemhr/loaddef.cpp b/utils/makemhr/loaddef.cpp
index 28f2e1b0..89893e38 100644
--- a/utils/makemhr/loaddef.cpp
+++ b/utils/makemhr/loaddef.cpp
@@ -402,7 +402,7 @@ static int TrReadInt(TokenReaderT *tr, const int loBound, const int hiBound, int
return 0;
}
temp[len] = '\0';
- *value = strtol(temp, nullptr, 10);
+ *value = static_cast<int>(strtol(temp, nullptr, 10));
if(*value < loBound || *value > hiBound)
{
TrErrorAt(tr, tr->mLine, col, "Expected a value from %d to %d.\n", loBound, hiBound);
@@ -1123,9 +1123,9 @@ static int LoadSofaSource(SourceRefT *src, const uint hrirRate, const uint n, do
various coordinate systems, listener/source orientations, and
direciontal vectors defined in the SOFA file.
*/
- target[0] = src->mAzimuth;
- target[1] = src->mElevation;
- target[2] = src->mRadius;
+ target[0] = static_cast<float>(src->mAzimuth);
+ target[1] = static_cast<float>(src->mElevation);
+ target[2] = static_cast<float>(src->mRadius);
mysofa_s2c(target);
nearest = mysofa_lookup(sofa->lookup, target);
@@ -1147,7 +1147,7 @@ static int LoadSofaSource(SourceRefT *src, const uint hrirRate, const uint n, do
return 0;
}
- ExtractSofaHrir(sofa, nearest, src->mChannel, src->mOffset, n, hrir);
+ ExtractSofaHrir(sofa, static_cast<uint>(nearest), src->mChannel, src->mOffset, n, hrir);
return 1;
}
@@ -1834,13 +1834,13 @@ static int ProcessSources(TokenReaderT *tr, HrirDataT *hData)
continue;
double ef{(90.0 + aer[1]) * (hData->mFds[fi].mEvCount - 1) / 180.0};
- ei = (int)std::round(ef);
+ ei = (uint)std::round(ef);
ef = (ef - ei) * 180.0f / (hData->mFds[fi].mEvCount - 1);
if(std::abs(ef) >= 0.1)
continue;
double af{aer[0] * hData->mFds[fi].mEvs[ei].mAzCount / 360.0f};
- ai = (int)std::round(af);
+ ai = (uint)std::round(af);
af = (af - ai) * 360.0f / hData->mFds[fi].mEvs[ei].mAzCount;
ai = ai % hData->mFds[fi].mEvs[ei].mAzCount;
if(std::abs(af) >= 0.1)
@@ -1913,7 +1913,7 @@ static int ProcessSources(TokenReaderT *tr, HrirDataT *hData)
if(!TrReadIdent(tr, MAX_IDENT_LEN, ident))
return 0;
- ti = MatchTargetEar(ident);
+ ti = static_cast<uint>(MatchTargetEar(ident));
if(static_cast<int>(ti) < 0)
{
TrErrorAt(tr, line, col, "Expected a target ear.\n");