Skip to content

Commit 2255c95

Browse files
committed
don't use c++20 , not working on Windows
1 parent 448e05d commit 2255c95

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

src/OpenCOVER/plugins/general/Sky/Sky.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void parseExifData(const std::filesystem::path &path, double &longitude, double
272272
std::optional<std::reference_wrapper<SkyEntry>> Sky::addSkyFile(std::filesystem::path path)
273273
{
274274
std::string fileName = path.filename().string();
275-
std::string extension = path.extension();
275+
std::string extension = path.extension().string();
276276

277277
auto relative = std::filesystem::relative(path, std::filesystem::path(skyPath)).string();
278278
std::string name = relative.substr(0, relative.length() - extension.length());
@@ -297,14 +297,7 @@ std::optional<std::reference_wrapper<SkyEntry>> Sky::addSkyFile(std::filesystem:
297297

298298
std::cout << "Parsed from EXIF: latitude=" << latitude << " longitude=" << longitude << " trueNorth=" << trueNorth << std::endl;
299299

300-
return m_skies.emplace_back(SkyEntry {
301-
.name = name,
302-
.displayName = std::regex_replace(name, std::regex("/"), ""),
303-
.fileName = path.string(),
304-
.longitude = longitude,
305-
.latitude = latitude,
306-
.trueNorth = trueNorth,
307-
});
300+
return m_skies.emplace_back(SkyEntry(name, std::regex_replace(name, std::regex("/"), ""), path.string(), longitude, latitude, trueNorth));
308301

309302
return std::nullopt;
310303
}

src/OpenCOVER/plugins/general/Sky/Sky.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131

3232
struct SkyEntry
3333
{
34+
public:
35+
SkyEntry(const std::string &name, const std::string &displayName, const std::string &fileName, double longitude, double latitude, double trueNorth)
36+
: name(name), displayName(displayName), fileName(fileName), longitude(longitude), latitude(latitude), trueNorth(trueNorth) {}
3437
std::string name;
3538
std::string displayName;
3639
std::string fileName;

0 commit comments

Comments
 (0)