gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows-breaking use of struct vs class

Browse Source 
MSVC's (broken) ABI breaks otherwise.
What the f@!$#ck, Microsoft?
(Thank you based Clang for warning, by the way.)
This commit is contained in:
ISSOtm
2022-03-10 21:01:55 +01:00
committed by Eldred Habert
parent 71cb2854e8
commit 3b1808cc8f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/gfx/pal_packing.hpp
View File

@@ -16,7 +16,7 @@
#include "gfx/main.hpp" #include "gfx/main.hpp"
class Palette; struct Palette;
class ProtoPalette; class ProtoPalette;
namespace packing { namespace packing {

2
include/gfx/pal_sorting.hpp
View File

@@ -17,7 +17,7 @@
#include "gfx/rgba.hpp" #include "gfx/rgba.hpp"
class Palette; struct Palette;
namespace sorting { namespace sorting {

6
src/gfx/convert.cpp
View File

@@ -77,19 +77,19 @@ class Png {
png_bytep transparencyPal = nullptr; png_bytep transparencyPal = nullptr;
[[noreturn]] static void handleError(png_structp png, char const *msg) { [[noreturn]] static void handleError(png_structp png, char const *msg) {
struct Png *self = reinterpret_cast<Png *>(png_get_error_ptr(png)); Png *self = reinterpret_cast<Png *>(png_get_error_ptr(png));
fatal("Error reading input image (\"%s\"): %s", self->path.c_str(), msg); fatal("Error reading input image (\"%s\"): %s", self->path.c_str(), msg);
} }
static void handleWarning(png_structp png, char const *msg) { static void handleWarning(png_structp png, char const *msg) {
struct Png *self = reinterpret_cast<Png *>(png_get_error_ptr(png)); Png *self = reinterpret_cast<Png *>(png_get_error_ptr(png));
warning("In input image (\"%s\"): %s", self->path.c_str(), msg); warning("In input image (\"%s\"): %s", self->path.c_str(), msg);
} }
static void readData(png_structp png, png_bytep data, size_t length) { static void readData(png_structp png, png_bytep data, size_t length) {
struct Png *self = reinterpret_cast<Png *>(png_get_io_ptr(png)); Png *self = reinterpret_cast<Png *>(png_get_io_ptr(png));
std::streamsize expectedLen = length; std::streamsize expectedLen = length;
std::streamsize nbBytesRead = self->file.sgetn(reinterpret_cast<char *>(data), expectedLen); std::streamsize nbBytesRead = self->file.sgetn(reinterpret_cast<char *>(data), expectedLen);