Syping/libragephoto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

RagePhoto: use C++17 u8path when available

Browse source
This commit is contained in:
Syping 2023-03-27 17:49:35 +02:00
parent cac7fd221f
commit 302be665e2
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/RagePhoto.cpp
View file

@ -27,6 +27,10 @@
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#if (RAGEPHOTO_CXX_STD >= 17) && (__cplusplus >= 201703L)
#include <filesystem>
#endif
#ifdef RAGEPHOTO_BENCHMARK #ifdef RAGEPHOTO_BENCHMARK
#include <chrono> #include <chrono>
#endif #endif
@ -587,7 +591,11 @@ bool RagePhoto::load(const std::string &data)
bool RagePhoto::loadFile(const std::string &filename) bool RagePhoto::loadFile(const std::string &filename)
{ {
#if (RAGEPHOTO_CXX_STD >= 17) && (__cplusplus >= 201703L)
std::ifstream ifs(std::filesystem::u8path(filename), std::ios::in | std::ios::binary);
#else
std::ifstream ifs(filename, std::ios::in | std::ios::binary); std::ifstream ifs(filename, std::ios::in | std::ios::binary);
#endif
if (ifs.is_open()) { if (ifs.is_open()) {
std::string sdata(std::istreambuf_iterator<char>{ifs}, {}); std::string sdata(std::istreambuf_iterator<char>{ifs}, {});
ifs.close(); ifs.close();
@ -955,7 +963,11 @@ bool RagePhoto::saveFile(const std::string &filename, uint32_t photoFormat)
bool ok; bool ok;
const std::string &sdata = save(photoFormat, &ok); const std::string &sdata = save(photoFormat, &ok);
if (ok) { if (ok) {
#if (RAGEPHOTO_CXX_STD >= 17) && (__cplusplus >= 201703L)
std::ofstream ofs(std::filesystem::u8path(filename), std::ios::out | std::ios::binary | std::ios::trunc);
#else
std::ofstream ofs(filename, std::ios::out | std::ios::binary | std::ios::trunc); std::ofstream ofs(filename, std::ios::out | std::ios::binary | std::ios::trunc);
#endif
if (!ofs.is_open()) { if (!ofs.is_open()) {
m_data->error = Error::Uninitialised; // 0 m_data->error = Error::Uninitialised; // 0
return false; return false;