Merge pull request #1056 from clasher113/main
Some checks are pending
x86-64 AppImage / build-appimage (ubuntu-22.04) (push) Waiting to run
Build / Build (push) Waiting to run
Macos Build / build-dmg (push) Waiting to run
Windows Build (CLang) / build-windows (clang, windows-latest) (push) Waiting to run
MSVC Build / build-windows (windows-2022) (push) Waiting to run

bug fix
This commit is contained in:
MihailRis 2026-10-20 21:22:59 +03:00 • committed by GitHub
commit 78a52a1d46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 75 additions and 21 deletions

View file

@ -12,7 +12,7 @@ using namespace imageio;
using image_reader =
std::function<std::unique_ptr<ImageData>(const ubyte*, size_t)>;
using image_writer = std::function<void(const std::string&, const ImageData*)>;
using image_writer = std::function<void(const io::path&, const ImageData*)>;
static std::unordered_map<ImageFileFormat, image_reader> readers {
{ImageFileFormat::PNG, png::load_image},
@ -75,7 +75,7 @@ void imageio::write(const io::path& file, const ImageData* image) {
"file format is not supported (write): " + file.string()
);
}
return found->second(io::resolve(file).u8string(), image);
return found->second(file, image);
}
util::Buffer<unsigned char> imageio::encode(

View file

@ -47,8 +47,25 @@ std::unique_ptr<audio::PCM> ogg::load_pcm(
const io::path& file, bool headerOnly
) {
OggVorbis_File vf;
int code;
if ((code = ov_fopen(io::resolve(file).u8string().c_str(), &vf))) {
FILE* fileHandle = nullptr;
#ifdef _WIN32
if (errno_t err =
_wfopen_s(
&fileHandle, io::resolve(file).wstring().c_str(), L"rb"
) != 0) {
#else
if ((fileHandle = fopen(io::resolve(file).u8string().c_str(), "rb")) ==
nullptr) {
#endif
throw std::runtime_error(
"could not open file " + file.string() + " for reading"
);
}
if (int code = ov_open(fileHandle, &vf, nullptr, 0)) {
if (fileHandle) {
fclose(fileHandle);
}
throw std::runtime_error("vorbis: " + vorbis_error_message(code));
}
std::vector<char> data;
@ -169,8 +186,25 @@ public:
std::unique_ptr<PCMStream> ogg::create_stream(const io::path& file) {
OggVorbis_File vf;
int code;
if ((code = ov_fopen(io::resolve(file).u8string().c_str(), &vf))) {
FILE* fileHandle = nullptr;
#ifdef _WIN32
if (errno_t err =
_wfopen_s(
&fileHandle, io::resolve(file).wstring().c_str(), L"rb"
) != 0) {
#else
if ((fileHandle = fopen(io::resolve(file).u8string().c_str(), "rb")) ==
nullptr) {
#endif
throw std::runtime_error(
"could not open file " + file.string() + " for reading"
);
}
if (int code = ov_open(fileHandle, &vf, nullptr, 0)) {
if (fileHandle) {
fclose(fileHandle);
}
throw std::runtime_error("vorbis: " + vorbis_error_message(code));
}
return std::make_unique<OggStream>(vf);

View file

@ -67,14 +67,20 @@ static util::Buffer<ubyte> write_to_memory(uint width, uint height, const ubyte*
// returns 0 if all-right, 1 otherwise
static int png_write(
const char* filename, uint width, uint height, const ubyte* data, bool alpha
const io::path& file, uint width, uint height, const ubyte* data, bool alpha
) {
uint pixsize = alpha ? 4 : 3;
// Open file for writing (binary mode)
FILE* fp = fopen(filename, "wb");
if (fp == nullptr) {
logger.error() << "could not open file " << filename << " for writing";
FILE* fp = nullptr;
#ifdef _WIN32
if (errno_t err =
_wfopen_s(&fp, io::resolve(file).wstring().c_str(), L"wb") != 0) {
#else
if ((fp = fopen(io::resolve(file).u8string().c_str(), "wb")) == nullptr) {
#endif
logger.error() << "could not open file " << file.string()
<< " for writing";
return 1;
}
@ -290,9 +296,9 @@ std::unique_ptr<Texture> png::load_texture(const std::string& filename) {
}
}
void png::write_image(const std::string& filename, const ImageData* image) {
void png::write_image(const io::path& file, const ImageData* image) {
png_write(
filename.c_str(),
file,
image->getWidth(),
image->getHeight(),
(const ubyte*)image->getData(),

View file

@ -8,10 +8,13 @@
class Texture;
class ImageData;
namespace io {
class path;
}
namespace png {
std::unique_ptr<ImageData> load_image(const ubyte* bytes, size_t size);
void write_image(const std::string& filename, const ImageData* image);
void write_image(const io::path& file, const ImageData* image);
util::Buffer<ubyte> encode_image(const ImageData& image);
std::unique_ptr<Texture> load_texture(const ubyte* bytes, size_t size);
std::unique_ptr<Texture> load_texture(const std::string& filename);

View file

@ -68,8 +68,8 @@ static void write(
}
}
void Logger::init(const std::string& filename) {
file.open(filename);
void Logger::init(const std::filesystem::path& path) {
file.open(path);
time_t tm = std::time(nullptr);
std::stringstream ss;

View file

@ -1,6 +1,7 @@
#pragma once
#include <sstream>
#include <filesystem>
namespace debug {
enum class LogLevel { print, debug, info, warning, error };
@ -27,7 +28,7 @@ namespace debug {
class Logger {
std::string name;
public:
static void init(const std::string& filename);
static void init(const std::filesystem::path& path);
static void flush();
Logger(const std::string& name) : name(name) {

View file

@ -44,7 +44,7 @@ int main(int argc, char** argv) {
? ".sub" + std::to_string(coreParameters.subProcessDepth)
: "") + ".log"s;
}
debug::Logger::init(logFile.u8string());
debug::Logger::init(logFile);
platform::configure_encoding();
auto& engine = Engine::getInstance();

View file

@ -1,15 +1,14 @@
#include "commons.hpp"
#pragma comment(lib, "Ws2_32.lib")
#define NOMINMAX
#include <stdexcept>
#include <limits>
#include <queue>
#include <thread>
#ifdef _WIN32
#define NOMINMAX
#include <curl/curl.h>
#pragma comment(lib, "Ws2_32.lib")
#define SHUT_RDWR SD_BOTH
#else
#include <sys/types.h>

View file

@ -7,6 +7,14 @@
#if defined(_WIN32)
#include <malloc.h>
#elif defined(__ANDROID__)
static inline void* aligned_alloc(size_t alignment, size_t size) {
void* ptr = nullptr;
if (posix_memalign(&ptr, alignment, size) != 0) {
return nullptr;
}
return ptr;
}
#endif
namespace util {
@ -63,6 +71,8 @@ namespace util {
std::unique_ptr<void, AlignedDeleter> ptr(
#if defined(_WIN32)
_aligned_malloc(sizeof(T), alignof(T))
#elif defined(__ANDROID__)
aligned_alloc(sizeof(T), alignof(T))
#else
std::aligned_alloc(alignof(T), sizeof(T))
#endif

View file

@ -38,6 +38,7 @@ TEST(SurroundMap, InitTest) {
#include "coders/png.hpp"
#include "graphics/core/ImageData.hpp"
#include "io/path.hpp"
void visualize(const SurroundMap& map, int mul, int max) {
const auto& areaMap = map.getArea();
@ -59,7 +60,7 @@ void visualize(const SurroundMap& map, int mul, int max) {
bytes[(y * w + x) * 3 + 2] = val;
}
}
png::write_image("test.png", &image);
png::write_image("user:test.png", &image);
}
TEST(SurroundMap, Visualize) {