mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Extract the correct number of values when loading a cached data file

Browse Source
This commit is contained in:
Alexander Bock
2024-03-28 20:22:40 +01:00
parent 48ba2d776d
commit b7da56c2df
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/data/dataloader.cpp
View File

@@ -272,7 +272,11 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
int valuesIdx = 0;
for (Dataset::Entry& e : result.entries) {
e.data.resize(nValues);
std::memcpy(e.data.data(), entriesBuffer.data() + valuesIdx, nValues);
std::memcpy(
e.data.data(),
entriesBuffer.data() + valuesIdx,
nValues * sizeof(float)
);
valuesIdx += nValues;
if (e.comment.has_value()) {
@@ -283,7 +287,7 @@ std::optional<Dataset> loadCachedFile(const std::filesystem::path& path) {
std::memcpy(e.comment->data(), &commentBuffer[commentIdx], e.comment->size());
// and then advance the index
commentIdx += e.comment->size();
commentIdx += static_cast<int>(e.comment->size());
}
}
@@ -354,8 +358,9 @@ void saveCachedFile(const Dataset& dataset, const std::filesystem::path& path) {
// We assume the number of values for each dataset to be the same, so we can store
// them upfront
uint16_t nValues = dataset.entries.empty() ? 0 : dataset.entries[0].data.size();
checkSize<uint16_t>(nValues, "Too many data variables");
size_t nValuesF = dataset.entries.empty() ? 0 : dataset.entries[0].data.size();
checkSize<uint16_t>(nValuesF, "Too many data variables");
uint16_t nValues = static_cast<uint16_t>(nValuesF);
std::vector<float> valuesBuffer;
valuesBuffer.reserve(dataset.entries.size() * nValues);