mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-06 19:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replaced std::getline usages with new ghoul::getline

Browse Source
This commit is contained in:
GPayne
2024-03-04 15:37:21 -07:00
parent 041cb5c68b
commit 210e17b0bb
36 changed files with 154 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/data/speckloader.cpp
View File

@@ -86,7 +86,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
std::string line;
// First phase: Loading the header information
while (std::getline(file, line)) {
while (ghoul::getline(file, line)) {
currentLineNumber++;
// Guard against wrong line endings (copying files from Windows to Mac) causes
@@ -232,9 +232,9 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
);
// For the first line, we already loaded it and rejected it above, so if we do another
// std::getline, we'd miss the first data value line
// ghoul::getline, we'd miss the first data value line
bool isFirst = true;
while (isFirst || std::getline(file, line)) {
while (isFirst || ghoul::getline(file, line)) {
currentLineNumber++;
isFirst = false;
@@ -330,7 +330,7 @@ Dataset loadSpeckFile(std::filesystem::path path, std::optional<DataMapping> spe
}
std::string rest;
std::getline(str, rest);
ghoul::getline(str, rest);
if (!rest.empty()) {
strip(rest);
@@ -368,7 +368,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
std::string line;
// First phase: Loading the header information
while (std::getline(file, line)) {
while (ghoul::getline(file, line)) {
// Ignore empty line or commented-out lines
if (line.empty() || line[0] == '#') {
continue;
@@ -408,9 +408,9 @@ Labelset loadLabelFile(std::filesystem::path path) {
}
// For the first line, we already loaded it and rejected it above, so if we do another
// std::getline, we'd miss the first data value line
// ghoul::getline, we'd miss the first data value line
bool isFirst = true;
while (isFirst || std::getline(file, line)) {
while (isFirst || ghoul::getline(file, line)) {
isFirst = false;
// Ignore empty line or commented-out lines
@@ -448,7 +448,7 @@ Labelset loadLabelFile(std::filesystem::path path) {
str >> entry.position.x >> entry.position.y >> entry.position.z;
std::string rest;
std::getline(str, rest);
ghoul::getline(str, rest);
strip(rest);
if (startsWith(rest, "id")) {
@@ -502,7 +502,7 @@ ColorMap loadCmapFile(std::filesystem::path path) {
int nColorLines = -1;
std::string line;
while (std::getline(file, line)) {
while (ghoul::getline(file, line)) {
// Ignore empty line or commented-out lines
if (line.empty() || line[0] == '#') {
continue;