Fixing more includes and forward declarations (#3876)

This commit is contained in:
Alexander Bock
2025-12-16 13:40:19 +01:00
committed by GitHub
parent c4fe078706
commit c02e59b9f8
1009 changed files with 5216 additions and 3589 deletions

View File

@@ -25,8 +25,10 @@
#include <modules/multiresvolume/rendering/histogrammanager.h>
#include <modules/multiresvolume/rendering/tsp.h>
#include <openspace/util/histogram.h>
#include <cstring>
#include <string>
#include <fstream>
#include <utility>
namespace openspace {
@@ -52,7 +54,7 @@ Histogram* HistogramManager::histogram(unsigned int brickIndex) {
}
bool HistogramManager::buildHistogram(TSP* tsp, unsigned int brickIndex) {
Histogram histogram(_minBin, _maxBin, _numBins);
Histogram histogram = Histogram(_minBin, _maxBin, _numBins);
const bool isBstLeaf = tsp->isBstLeaf(brickIndex);
const bool isOctreeLeaf = tsp->isOctreeLeaf(brickIndex);
@@ -122,7 +124,7 @@ std::vector<float> HistogramManager::readValues(TSP* tsp, unsigned int brickInde
}
bool HistogramManager::loadFromFile(const std::filesystem::path& filename) {
std::ifstream file(filename, std::ios::in | std::ios::binary);
std::ifstream file = std::ifstream(filename, std::ios::in | std::ios::binary);
if (!file.is_open()) {
return false;
}
@@ -147,12 +149,11 @@ bool HistogramManager::loadFromFile(const std::filesystem::path& filename) {
_histograms[i] = Histogram(_minBin, _maxBin, _numBins, data);
}
file.close();
return true;
}
bool HistogramManager::saveToFile(const std::filesystem::path& filename) {
std::ofstream file(filename, std::ios::out | std::ios::binary);
std::ofstream file = std::ofstream(filename, std::ios::out | std::ios::binary);
if (!file.is_open()) {
return false;
}
@@ -173,7 +174,6 @@ bool HistogramManager::saveToFile(const std::filesystem::path& filename) {
file.write(reinterpret_cast<char*>(histogramData.data()), sizeof(float) * nFloats);
file.close();
return true;
}