aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <chris.kcat@gmail.com>2019-12-09 23:11:16 -0800
committerChris Robinson <chris.kcat@gmail.com>2019-12-09 23:11:16 -0800
commit47f416efafd751b2a92ed01882f6c4ad3d4c3587 (patch)
tree65e7a7bc420e454e5176f4dd4f0d7b2243c41771
parentd6bc56d7c1be87eb7c3bce2f024bf7814dcd6dfa (diff)
Simplify a couple assignments
-rw-r--r--utils/makemhr/loadsofa.cpp8
-rw-r--r--utils/sofa-info.cpp8
2 files changed, 6 insertions, 10 deletions
diff --git a/utils/makemhr/loadsofa.cpp b/utils/makemhr/loadsofa.cpp
index b5dcf2ef..886bd6ff 100644
--- a/utils/makemhr/loadsofa.cpp
+++ b/utils/makemhr/loadsofa.cpp
@@ -193,11 +193,9 @@ static bool PrepareLayout(const uint m, const float *xyzs, HrirDataT *hData)
auto aers = std::vector<double3>(m, double3{});
for(uint i{0u};i < m;++i)
{
- float aer[3]{xyzs[i*3], xyzs[i*3 + 1], xyzs[i*3 + 2]};
- mysofa_c2s(&aer[0]);
- aers[i][0] = aer[0];
- aers[i][1] = aer[1];
- aers[i][2] = aer[2];
+ float vals[3]{xyzs[i*3], xyzs[i*3 + 1], xyzs[i*3 + 2]};
+ mysofa_c2s(&vals[0]);
+ aers[i] = {vals[0], vals[1], vals[2]};
}
auto radii = GetUniquelySortedElems(aers, 2, {}, {0.1, 0.1, 0.001});
diff --git a/utils/sofa-info.cpp b/utils/sofa-info.cpp
index b7346939..81136334 100644
--- a/utils/sofa-info.cpp
+++ b/utils/sofa-info.cpp
@@ -214,11 +214,9 @@ static void PrintCompatibleLayout(const uint m, const float *xyzs)
auto aers = std::vector<double3>(m, double3{});
for(uint i{0u};i < m;++i)
{
- float aer[3]{xyzs[i*3], xyzs[i*3 + 1], xyzs[i*3 + 2]};
- mysofa_c2s(&aer[0]);
- aers[i][0] = aer[0];
- aers[i][1] = aer[1];
- aers[i][2] = aer[2];
+ float vals[3]{xyzs[i*3], xyzs[i*3 + 1], xyzs[i*3 + 2]};
+ mysofa_c2s(&vals[0]);
+ aers[i] = {vals[0], vals[1], vals[2]};
}
auto radii = GetUniquelySortedElems(aers, 2, {}, {0.1, 0.1, 0.001});