mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 15:54:31 +01:00
Code Issues Releases Wiki Activity

Close #16566: Favour WinNT preprocessor version checks over MinGW (#16677)

Browse Source
This commit is contained in:
Silent
2022-03-11 11:59:09 +01:00
committed by GitHub
parent 49fbc30a97
commit 5e725913f8
9 changed files with 40 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/core/Imaging.cpp
View File

@@ -13,6 +13,7 @@
#include "../Version.h"
#include "../drawing/Drawing.h"
#include "FileSystem.hpp"
#include "Guard.hpp"
#include "IStream.hpp"
#include "Memory.hpp"
@@ -311,12 +312,7 @@ namespace Imaging
return ReadFromFile(path, GetImageFormatFromPath(path));
default:
{
#if defined(_WIN32) && !defined(__MINGW32__)
auto pathW = String::ToWideChar(path);
std::ifstream fs(pathW, std::ios::binary);
#else
std::ifstream fs(std::string(path), std::ios::binary);
#endif
std::ifstream fs(u8path(path), std::ios::binary);
return ReadFromStream(fs, format);
}
}
@@ -337,12 +333,7 @@ namespace Imaging
break;
case IMAGE_FORMAT::PNG:
{
#if defined(_WIN32) && !defined(__MINGW32__)
auto pathW = String::ToWideChar(path);
std::ofstream fs(pathW, std::ios::binary);
#else
std::ofstream fs(std::string(path), std::ios::binary);
#endif
std::ofstream fs(u8path(path), std::ios::binary);
WritePng(fs, image);
break;
}